diff --git a/assets/javascripts/discourse/models/knowledge-explorer.js.es6 b/assets/javascripts/discourse/models/knowledge-explorer.js.es6
index 2e7f36f..1b89484 100644
--- a/assets/javascripts/discourse/models/knowledge-explorer.js.es6
+++ b/assets/javascripts/discourse/models/knowledge-explorer.js.es6
@@ -26,6 +26,15 @@ export default {
         });
       });
     }
+    else {
+      promise = promise.then(data => {
+        data.topics.topic_list.topics = data.topics.topic_list.topics.map(topic => {
+           topic = Topic.create(topic);
+           return topic;
+        });
+        return data;     
+      });
+    }
 
     return promise;
   },
diff --git a/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs b/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs
index 363bc08..46b8fbd 100644
--- a/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs
+++ b/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs
@@ -27,14 +27,7 @@
       <tr>
         <td class="main-link">
           <span class="link-top-line">
-            <div class="topic-statuses">
-              {{#if topic.closed}}
-                <span title={{i18n 'topic_statuses.locked.help'}} class="topic-status">{{d-icon 'lock'}}</span>
-              {{/if}}
-              {{#unless topic.visible}}
-                <span title={{i18n 'topic_statuses.unlisted.help'}} class="topic-status">{{d-icon 'far-eye-slash'}}</span>
-              {{/unless}}
-            </div>
+            {{topic-status topic=topic}}
             {{knowledge-explorer-topic-link
               topic=topic
               selectTopic=selectTopic