diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 55aea4272..455195399 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -382,44 +382,49 @@ export default {
         cleanDefaultOption() {
             this.defaultOption = "";
         },
-        OnClickSidebarItem(item) {
-            if (item.item.page && item.item.page === "advanced-search") {
-                this.page = "advanced-search";
-                this.filters = item.item.filters;
-                this.pageId = item.item.id;
-                this.pageUri = item.item.href;
-                this.pageName = item.item.title;
-            } else {
-                this.filters = [];
-                this.pageId = null;
-                this.pageUri = item.item.href;
-                this.page = item.item.page || "MyCases";
-                this.settings = this.config.setting[this.page];
-                if (!this.menuMap[item.item.id]) {
-                    this.page = "custom-case-list";
-                    if (this.config.setting[item.item.page] && this.config.setting[item.item.page]["customCaseList"]) {
-                        this.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
-                    } else {
-                        this.settings = {};
-                    }
-                    this.pageData = {
-                        pageUri: item.item.pageUri,
-                        pageParent: item.item.page,
-                        pageName: item.item.title,
-                        pageIcon: item.item.icon,
-                        customListId: item.item.id,
-                        color: item.item.colorScreen,
-                        settings: this.settings
-                    }
-                    
-                }
-                if (this.page === this.lastPage
-                    && this.$refs["component"]
-                    && this.$refs["component"].updateView) {
-                    this.$refs["component"].updateView(this.pageData);
-                }
-                this.lastPage = this.page;
+        /**
+         * Page view factory
+         * @param {object} item
+         */
+        pageFactory(item){
+            this.filters = [];
+            this.page = item.item.page;
+            this.filters = item.item.filters;
+            this.pageId = item.item.id;
+            this.pageUri = item.item.href;
+            this.pageName = item.item.title;
+            this.settings = this.config.setting[this.page];
+            this.pageData = {
+                pageUri: item.item.pageUri,
+                pageParent: item.item.page,
+                pageName: item.item.title,
+                pageIcon: item.item.icon,
+                customListId: item.item.id, 
+                color: item.item.colorScreen,
+                settings: this.settings
             }
+            //Custom Cases List
+            if (!this.menuMap[item.item.id] && item.item.page !== "LegacyFrame" && item.item.page !== "advanced-search" ) {
+                this.page = "custom-case-list";
+                if (this.config.setting[item.item.page] && this.config.setting[item.item.page]["customCaseList"]) {
+                    this.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
+                } else {
+                    this.settings = {};
+                }
+            }
+            if (this.page === this.lastPage
+                && this.$refs["component"]
+                && this.$refs["component"].updateView) {
+                this.$refs["component"].updateView(this.pageData);
+            }
+            this.lastPage = this.page;
+        },
+        /**
+         * Click sidebar menu item handler
+         * @param {object} item
+         */
+        OnClickSidebarItem(item) {
+            this.pageFactory(item);
         },
         setCounter() {
             let that = this,
diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue
index 22b78b6a6..f6d347401 100644
--- a/resources/assets/js/home/Unassigned/Unassigned.vue
+++ b/resources/assets/js/home/Unassigned/Unassigned.vue
@@ -403,10 +403,10 @@ export default {
                     ],
                     refresh: true
                 };
+                this.$emit("cleanDefaultOption");
+                this.onUpdateFilters(filter);
             }
-            this.$emit("cleanDefaultOption");
         }
-        this.onUpdateFilters(filter);
     },
     /**
      * On row click event handler