diff --git a/entries/static/entries/js/forms.js b/entries/static/entries/js/forms.js
index cef394d5e36e9d47df398a7397a1db4c2dc9c1cb..b123492bd940332a30525ca435345a8861b087fb 100644
--- a/entries/static/entries/js/forms.js
+++ b/entries/static/entries/js/forms.js
@@ -427,9 +427,6 @@ function initialize_main_form() {
                 if (response.errors) {
                     show_form_errors(main_form, response.errors);
                 } else if (response.success) {
-                    if(window.unificationLeftPaneApp) {
-                        // window.unificationLeftPaneApp.refresh();
-                    }
                     update_entries();
                     $('#entry-filters').modal('hide');
                 }
@@ -479,7 +476,7 @@ function initialize_local_form(selector, url) {
                 if (response.errors) {
                     show_form_errors(form, response.errors);
                 } else if (response.success) {
-                    get_entry(curr_entry, curr_no_filters);
+                    update_entries();
                     selector.modal('hide');
                 }
                 submit.prop('disabled', false);
diff --git a/frontend/src/components/unification/Entries/EntriesList.vue b/frontend/src/components/unification/Entries/EntriesList.vue
index 72b1f494606216d22eca6cba2b0a9c7875024e04..40e4b3c958d1c7b784ce0a355ff65b4cef0028f8 100644
--- a/frontend/src/components/unification/Entries/EntriesList.vue
+++ b/frontend/src/components/unification/Entries/EntriesList.vue
@@ -24,11 +24,11 @@
       }
     },
     methods: {
-      setup() {
+      reset_entry_list() {
+        this.$emit('lexicalUnitSelected', null, null);
         setup_entries_list({
           table: this.$refs.table,
           lexicalUnitSelected: (entryId, lexicalUnitId) => { this.$emit('lexicalUnitSelected', entryId, lexicalUnitId); },
-          selectEntryId: this.initialEntryId
         });
       }
     },
diff --git a/frontend/src/components/unification/shared/LexicalUnitDisplay.vue b/frontend/src/components/unification/shared/LexicalUnitDisplay.vue
index bdd4a5718716386b48d31bde45f072f0c11c96eb..518dbdc96ccca786ff986d2dfc9da2f224ab2271 100644
--- a/frontend/src/components/unification/shared/LexicalUnitDisplay.vue
+++ b/frontend/src/components/unification/shared/LexicalUnitDisplay.vue
@@ -150,7 +150,7 @@ export default {
         success  : function(response) {
 
           window.clear_info();
-          this.frame = response.frames[0];
+          this.frame = response.frames.length > 0 ? response.frames[0] : null;
           this.unifiedFrame = response.unified_frame;
           this.subentries = response.subentries;
           this.alternations = response.alternations;
@@ -278,7 +278,7 @@ export default {
 <!--            <p class="mx-1 my-1" id="semantics-no-examples">{{ gettext("Brak przykładów") }}</p>-->
 <!--        </div>-->
         <div class="col w-100 pr-4 overflow-auto">
-          <examples-component v-if="examples"
+          <examples-component v-if="examples && frame"
               :examples="examples" 
               :frame="frame"
               :frame_arguments="selectedFrameArguments"
diff --git a/frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue b/frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue
index b6bfb59cfb59c49b8ebb222b6751e65c01a6b70a..8c87ec9319aa631aa5d65efb5676b538c6bb2d3c 100644
--- a/frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue
+++ b/frontend/src/components/unification/shared/frame-components/SemanticsSchemataComponent.vue
@@ -123,7 +123,7 @@ export default {
           <div class="mb-1 sticky-top"><h5 class="bg-dark text-light p-1">{{subentry.str}}</h5></div>
           <template v-for="schema in subentry.schemata">
             <div class="schema mb-3" 
-                v-if="alternations[this.frame.id][schema.id]"
+                v-if="this.frame && alternations[this.frame.id][schema.id]"
                 @mouseenter="schema.hover=true"
                 @mouseleave="schema.hover=false"
                 @click="selectSchema(schema)"
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 38a4e6c524b697e4b3c365cbbd8010bcb9444ddd..3e8ecc4816a2f0882e76a9cf2f5689022c5defd3 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -25,6 +25,6 @@ window.update_entries = function () {
     mounted = true;
   }
   if(app._context.config.globalProperties.$entries_list) {
-    app._context.config.globalProperties.$entries_list.setup();
+    app._context.config.globalProperties.$entries_list.reset_entry_list();
   }
 }