diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index ce75d0cbe49..fc80e420cdb 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -45,7 +45,7 @@
                 <a-select
                   v-if="!dataView && $route.meta.filters && $route.meta.filters.length > 0"
                   :placeholder="$t('label.filterby')"
-                  :value="$route.query.filter"
+                  :value="$route.query.filter || 'self'"
                   style="min-width: 100px; margin-left: 10px"
                   @change="changeFilter">
                   <a-icon slot="suffixIcon" type="filter" />
@@ -534,6 +534,10 @@ export default {
         })
       }
 
+      if (['listTemplates', 'listIsos'].includes(this.apiName) && this.dataView) {
+        delete params.showunique
+      }
+
       this.loading = true
       if (this.$route.params && this.$route.params.id) {
         params.id = this.$route.params.id
@@ -571,10 +575,6 @@ export default {
           this.items = []
         }
 
-        if (['listTemplates', 'listIsos'].includes(this.apiName) && this.items.length > 1) {
-          this.items = [...new Map(this.items.map(x => [x.id, x])).values()]
-        }
-
         for (let idx = 0; idx < this.items.length; idx++) {
           this.items[idx].key = idx
           for (const key in customRender) {