diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
index 66bde576377..c1844193b8f 100644
--- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
@@ -89,10 +89,8 @@ export default function(connectionName, options) {
 
   var self = this;
   if (_connectorCache[connectionName]) {
-    var view,
-        childViews = _connectorCache[connectionName].map(function(vc) {
-          return vc.create({ context: self });
-        });
+    var view;
+    var childViews = _connectorCache[connectionName];
 
     // If there is more than one view, create a container. Otherwise
     // just shove it in.
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index e26d698d386..14e4bee9b9d 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -46,8 +46,8 @@
     {{/if}}
     {{#if showPosterAvatar}}
       <li {{bind-attr class=":avatars mapCollapsed::hidden"}}>
-        {{#each details.fewParticipants}}
-          {{topic-participant participant=this}}
+        {{#each p in details.fewParticipants}}
+          {{topic-participant participant=p}}
         {{/each}}
       </li>
     {{/if}}
@@ -56,8 +56,8 @@
 
 {{#unless mapCollapsed}}
   <section class='avatars clearfix'>
-    {{#each details.participants}}
-      {{topic-participant participant=this}}
+    {{#each p in details.participants}}
+      {{topic-participant participant=p}}
     {{/each}}
   </section>
 
@@ -65,16 +65,16 @@
     <section class='links'>
 
         <table class='topic-links'>
-          {{#each infoLinks}}
+          {{#each link in infoLinks}}
             <tr>
             <td>
-              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{clicks}}</span>
+              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{link.clicks}}</span>
             </td>
             <td>
-              <a href="{{unbound url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound user_id}}" data-ignore-post-id="true" title="{{unbound url}}">
-                {{#if title}}{{title}}{{else}}{{shorten-url url}}{{/if}}
+              <a href="{{unbound link.url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound link.user_id}}" data-ignore-post-id="true" title="{{unbound link.url}}">
+                {{#if link.title}}{{link.title}}{{else}}{{shorten-url link.url}}{{/if}}
               </a>
-              {{link-domain this}}
+              {{link-domain link}}
             </td>
             </tr>
           {{/each}}