diff --git a/js/ajax.js b/js/ajax.js
index 22265140e0..303a6eea78 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -294,6 +294,13 @@ var AJAX = {
                 }
 
                 if (data._selflink) {
+                    
+                    var source = data._selflink.split('?')[0];
+                    //Check for faulty links
+                    if (source == "import.php") {
+                    	var replacement = "tbl_sql.php";
+                    	data._selflink = data._selflink.replace(source,replacement);
+                    }
                     $('#selflink > a').attr('href', data._selflink);
                 }
                 if (data._scripts) {
diff --git a/js/functions.js b/js/functions.js
index 7663565a59..75c2c1e00e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1389,6 +1389,8 @@ AJAX.registerOnload('functions.js', function () {
     });
 
     $("input#sql_query_edit_save").live('click', function () {
+        $(".success").hide();
+        //hide already existing success message
         var sql_query;
         if (codemirror_inline_editor) {
             sql_query = codemirror_inline_editor.getValue();