diff --git a/rhodecode/templates/admin/gists/gist_index.mako b/rhodecode/templates/admin/gists/gist_index.mako
index f20bbf0e..41e8c827 100644
--- a/rhodecode/templates/admin/gists/gist_index.mako
+++ b/rhodecode/templates/admin/gists/gist_index.mako
@@ -92,8 +92,9 @@ $(document).ready(function() {
     );
 
     // gists list
+    var gist_data = ${c.data|n};
     $('#gist_list_table').DataTable({
-      data: ${c.data|n},
+      data: gist_data,
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 4, "desc" ]],
diff --git a/rhodecode/templates/admin/my_account/my_account_repos.mako b/rhodecode/templates/admin/my_account/my_account_repos.mako
index 4edf6eb9..8427fb69 100644
--- a/rhodecode/templates/admin/my_account/my_account_repos.mako
+++ b/rhodecode/templates/admin/my_account/my_account_repos.mako
@@ -17,9 +17,10 @@ $(document).ready(function() {
 
     // repo list
     $repoListTable = $('#repo_list_table');
+    var repos_data = ${c.data|n};
 
     $repoListTable.DataTable({
-      data: ${c.data|n},
+      data: repos_data,
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
index 99e1ffa2..01585ae2 100644
--- a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
+++ b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
@@ -28,8 +28,9 @@ $(document).ready(function() {
         row.remove().draw();
     } );
 
+    var user_groups_data = ${c.user_groups|n};
     $('#user_group_list_table').DataTable({
-      data: ${c.user_groups|n},
+      data: user_groups_data,
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/admin/my_account/my_account_watched.mako b/rhodecode/templates/admin/my_account/my_account_watched.mako
index 93f222a5..48e47329 100644
--- a/rhodecode/templates/admin/my_account/my_account_watched.mako
+++ b/rhodecode/templates/admin/my_account/my_account_watched.mako
@@ -18,8 +18,9 @@ $(document).ready(function() {
     // repo list
     $repoListTable = $('#repo_list_table');
 
+    var watched_repos_data = ${c.data|n};
     $repoListTable.DataTable({
-      data: ${c.data|n},
+      data: watched_repos_data,
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/admin/users/user_edit_groups.mako b/rhodecode/templates/admin/users/user_edit_groups.mako
index bff0be26..3a54451e 100644
--- a/rhodecode/templates/admin/users/user_edit_groups.mako
+++ b/rhodecode/templates/admin/users/user_edit_groups.mako
@@ -46,8 +46,9 @@ $(document).ready(function() {
         row.remove().draw();
     } );
 
+    var groups_data = ${c.groups|n};
     $('#user_group_list_table').DataTable({
-      data: ${c.groups|n},
+      data: groups_data,
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/bookmarks/bookmarks.mako b/rhodecode/templates/bookmarks/bookmarks.mako
index a7968268..fae0b438 100644
--- a/rhodecode/templates/bookmarks/bookmarks.mako
+++ b/rhodecode/templates/bookmarks/bookmarks.mako
@@ -62,9 +62,10 @@ $(document).ready(function() {
       $('#obj_count').text(_text);
     };
 
+    var bookmarks_data = ${c.data|n};
     // object list
     $('#obj_list_table').DataTable({
-      data: ${c.data | n},
+      data: bookmarks_data,
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/branches/branches.mako b/rhodecode/templates/branches/branches.mako
index 8950b027..3966382c 100644
--- a/rhodecode/templates/branches/branches.mako
+++ b/rhodecode/templates/branches/branches.mako
@@ -61,9 +61,10 @@ $(document).ready(function() {
       $('#obj_count').text(_text);
     };
 
+    var branches_data = ${c.data|n};
     // object list
     $('#obj_list_table').DataTable({
-      data: ${c.data|n},
+      data: branches_data,
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 0, "asc" ]],
diff --git a/rhodecode/templates/tags/tags.mako b/rhodecode/templates/tags/tags.mako
index a95c0313..2727089f 100644
--- a/rhodecode/templates/tags/tags.mako
+++ b/rhodecode/templates/tags/tags.mako
@@ -62,9 +62,10 @@ $(document).ready(function() {
       $('#obj_count').text(_text);
     };
 
+    var tags_data = ${c.data|n};
     // object list
     $('#obj_list_table').DataTable({
-      data: ${c.data|n},
+      data: tags_data,
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 0, "asc" ]],