diff --git a/assets/javascripts/discourse/templates/components/knowledge-explorer-tag.hbs b/assets/javascripts/discourse/templates/components/knowledge-explorer-tag.hbs
index 60dcdad..66109a5 100644
--- a/assets/javascripts/discourse/templates/components/knowledge-explorer-tag.hbs
+++ b/assets/javascripts/discourse/templates/components/knowledge-explorer-tag.hbs
@@ -2,7 +2,7 @@
   {{#unless tag.active}}
     {{d-icon "plus"}}
   {{/unless}}
-  {{tag.id}} <span class="tag-count">({{tag.count}})</span>
+  <span class="tag-id">{{tag.id}}</span><span class="tag-count">({{tag.count}})</span>
   {{#if tag.active}}
     {{d-icon "times-circle"}}
   {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/knowledge-explorer-tags.hbs b/assets/javascripts/discourse/templates/components/knowledge-explorer-tags.hbs
index e2b2aa9..c00b103 100644
--- a/assets/javascripts/discourse/templates/components/knowledge-explorer-tags.hbs
+++ b/assets/javascripts/discourse/templates/components/knowledge-explorer-tags.hbs
@@ -1,4 +1,4 @@
-{{#each model.tags as |tag|}}
+{{#each tags as |tag|}}
     {{knowledge-explorer-tag tag=tag}}
 {{/each}}
 
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 f3e7177..ec418ef 100644
--- a/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs
+++ b/assets/javascripts/discourse/templates/components/knowledge-explorer-topic-list.hbs
@@ -4,7 +4,7 @@
     <th>Activity</th>
   </thead>
   <tbody>
-    {{#each model.topics as |topic|}}
+    {{#each topics as |topic|}}
     <tr>
       <td class="main-link">
         <span class="link-top-line">
diff --git a/assets/javascripts/discourse/templates/knowledge-explorer.hbs b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
index d8909f5..4b5e72e 100644
--- a/assets/javascripts/discourse/templates/knowledge-explorer.hbs
+++ b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
@@ -1,6 +1,6 @@
 <div class="knowledge-explorer">
   {{knowledge-explorer-tags
-      model=model
+      tags=model.tags
       searchResults=searchResults}}
-  {{knowledge-explorer-topic-list model=model}}
+  {{knowledge-explorer-topic-list topics=model.topics}}
 </div>