diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 9b24ea39..95c5e6bd 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -128,7 +128,7 @@ class Browse extends Query
             }
         }
     }
-    
+
     /**
      * show_objects
      * This takes an array of objects
@@ -476,7 +476,7 @@ class Browse extends Query
     {
         $this->show_header = $show_header;
     }
-    
+
     /**
      * Allow the current page to be save into the current session
      * @param boolean $update_session
@@ -494,7 +494,7 @@ class Browse extends Query
     {
         return $this->show_header;
     }
-    
+
     /**
      *
      * @return boolean
diff --git a/lib/class/query.class.php b/lib/class/query.class.php
index 6925db08..4516ee50 100644
--- a/lib/class/query.class.php
+++ b/lib/class/query.class.php
@@ -78,7 +78,7 @@ class Query
         if (is_null($id)) {
             $this->reset();
             $data = self::_serialize($this->_state);
-            
+
             $sql = 'INSERT INTO `tmp_browse` (`sid`, `data`) VALUES(?, ?)';
             Dba::write($sql, array($sid, $data));
             $this->id = Dba::insert_id();
@@ -92,7 +92,7 @@ class Query
 
                 $this->id = $id;
                 $this->_state = self::_unserialize($results['data']);
-                
+
                 return true;
             }
         }
@@ -2061,7 +2061,7 @@ class Query
             $data = self::_serialize($this->_state);
 
             debug_event('DEBUG', 'Query Store Function called: {'.json_encode($data).'}', '5');
-            
+
             $sql = 'UPDATE `tmp_browse` SET `data` = ? WHERE `sid` = ? AND `id` = ?';
             Dba::write($sql, array($data, session_id(), $id));
         }
diff --git a/lib/class/ui.class.php b/lib/class/ui.class.php
index 1c5835c8..b609c752 100644
--- a/lib/class/ui.class.php
+++ b/lib/class/ui.class.php
@@ -284,6 +284,9 @@ END;
      */
     public static function show_footer()
     {
+        if (!defined("TABLE_RENDERED")) {
+            show_table_render();
+        }
         require_once AmpConfig::get('prefix') . '/templates/footer.inc.php';
         if (isset($_REQUEST['profiling'])) {
             Dba::show_profile();
diff --git a/lib/javascript/tabledata.js b/lib/javascript/tabledata.js
index 4dae987a..56ab0667 100644
--- a/lib/javascript/tabledata.js
+++ b/lib/javascript/tabledata.js
@@ -19,10 +19,15 @@
 //
 
 $(document).ready(function() {
-    if ($('.tabledata').mediaTable()) {
+    InitTableData();
+});
+
+function InitTableData()
+{
+	if ($('.tabledata').mediaTable()) {
         ResponsiveElements.init();
         setTimeout(function() {
             $('.tabledata').mediaTable('analyze');
         }, 1);
     }
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/browse.ajax.php b/server/browse.ajax.php
index 33e2bc28..222b8b63 100644
--- a/server/browse.ajax.php
+++ b/server/browse.ajax.php
@@ -70,7 +70,7 @@ switch ($_REQUEST['action']) {
             $browse->set_filter('catalog', null);
             unset($_SESSION['catalog']);
         }
-        
+
         ob_start();
         $browse->show_objects();
         $results[$browse->get_content_div()] = ob_get_clean();
@@ -182,7 +182,7 @@ switch ($_REQUEST['action']) {
                 }
             break;
         }
-        
+
         ob_start();
         $browse->show_objects();
         $results[$browse->get_content_div()] = ob_get_clean();
diff --git a/stats.php b/stats.php
index b33f48f5..b2b1be54 100644
--- a/stats.php
+++ b/stats.php
@@ -69,5 +69,4 @@ switch ($_REQUEST['action']) {
     break;
 } // end switch on action
 
-show_table_render(false, true);
 UI::show_footer();
diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php
index 664df7df..8ab178cf 100644
--- a/templates/list_header.inc.php
+++ b/templates/list_header.inc.php
@@ -102,7 +102,7 @@ if ($limit > 0 && $total > $limit) {
     if ($start > 0) {
         $current_page = floor($start / $limit);
     }
-    
+
     if ($browse->get_use_pages()) {
 ?>
     <span class="list-header-navmenu-border">
diff --git a/templates/show_album_group_disks.inc.php b/templates/show_album_group_disks.inc.php
index cd302060..1bbc0c56 100644
--- a/templates/show_album_group_disks.inc.php
+++ b/templates/show_album_group_disks.inc.php
@@ -155,4 +155,3 @@ if ($directplay_limit > 0) {
     ?>
     </div><br />
 <?php } ?>
-<?php show_table_render(true, true); ?>
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index a7d3c2c5..cc60a692 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -104,5 +104,4 @@ $thcount = 8;
         </tr>
     <tfoot>
 </table>
-<?php show_table_render(); ?>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index 7dc935ff..dedb303e 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -106,5 +106,4 @@ $thcount = 8;
         </tr>
     </tfoot>
 </table>
-<?php show_table_render(); ?>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_tvshow_seasons.inc.php b/templates/show_tvshow_seasons.inc.php
index 916b4a45..a52fa6f8 100644
--- a/templates/show_tvshow_seasons.inc.php
+++ b/templates/show_tvshow_seasons.inc.php
@@ -85,5 +85,4 @@ $thcount = 6;
         </tr>
     <tfoot>
 </table>
-<?php show_table_render(); ?>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_tvshows.inc.php b/templates/show_tvshows.inc.php
index 1a068d58..b4f2b177 100644
--- a/templates/show_tvshows.inc.php
+++ b/templates/show_tvshows.inc.php
@@ -91,5 +91,4 @@ $thcount = 8;
         </tr>
     </tfoot>
 </table>
-<?php show_table_render(); ?>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php
index f00d4281..aee3fea6 100644
--- a/templates/show_videos.inc.php
+++ b/templates/show_videos.inc.php
@@ -102,5 +102,4 @@ if (isset($video_type) && $video_type != 'video') {
         </tr>
     </tfoot>
 </table>
-<?php show_table_render(); ?>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>