diff --git a/Dashboard/app/js/templates/navData/monitoring-data-row.handlebars b/Dashboard/app/js/templates/navData/monitoring-data-row.handlebars
index 1d88be3fb8..89b8138dc9 100644
--- a/Dashboard/app/js/templates/navData/monitoring-data-row.handlebars
+++ b/Dashboard/app/js/templates/navData/monitoring-data-row.handlebars
@@ -1,8 +1,8 @@
 <tr>
     <td class="device">{{view.dataPointRowNumber}}</td>
-    <td class="displayName" style="text-align:left;">{{item.displayName}}</td>
-    <td class="identifier" style="text-align:left;">{{item.identifier}}</td>
-    <td class="collected">{{#with item}}{{date1 lastUpdateDateTime}}{{/with}}</td>
+    <td class="displayName" style="text-align:left;">{{displayName}}</td>
+    <td class="identifier" style="text-align:left;">{{identifier}}</td>
+    <td class="collected">{{date1 lastUpdateDateTime}}</td>
 
     {{#if view.parentView.showApprovalStatusColumn}}
     <td class="approvalStatus">
diff --git a/Dashboard/app/js/templates/navData/monitoring-data.handlebars b/Dashboard/app/js/templates/navData/monitoring-data.handlebars
index 1b464cdbac..e6c31d694a 100644
--- a/Dashboard/app/js/templates/navData/monitoring-data.handlebars
+++ b/Dashboard/app/js/templates/navData/monitoring-data.handlebars
@@ -41,8 +41,8 @@
           </tr>
         </thead>
         <tbody>
-          {{#each item in FLOW.router.surveyedLocaleController.currentContents}}
-           {{view FLOW.DataPointView contentBinding="item"}}
+          {{#each FLOW.router.surveyedLocaleController.currentContents}}
+           {{view FLOW.DataPointView contentBinding="this"}}
           {{/each}}
         </tbody>
       </table>