diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 2f44ebe1a9..36bfbaeb18 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -142,7 +142,12 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
 
 
     // Get query result
-    var searchedData = jQuery.parseJSON($('#querydata').html());
+    var searchedData;
+    try {
+        searchedData = jQuery.parseJSON($('#querydata').html());
+    } catch (err) {
+        searchedData = null;
+    }
 
     /**
      ** Input form submit on field change
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 881ebeff41..6b6096a15c 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -30,6 +30,7 @@ $scripts->addFile('jqplot/plugins/jqplot.cursor.js');
 $scripts->addFile('canvg/canvg.js');
 $scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
 $scripts->addFile('tbl_zoom_plot_jqplot.js');
+$scripts->addFile('tbl_change.js');
 
 $table_search = new PMA_TableSearch($db, $table, "zoom");