diff --git a/bazarr/get_subtitle.py b/bazarr/get_subtitle.py
index d743dce54..81d2e8a6e 100644
--- a/bazarr/get_subtitle.py
+++ b/bazarr/get_subtitle.py
@@ -181,8 +181,6 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce
                                                            pre_download_hook=None,  # fixme
                                                            post_download_hook=None,  # fixme
                                                            language_hook=None)  # fixme
-            for provider in providers:
-                track_event(category=provider, action='search', label=language_from_alpha3(language[0]))
         else:
             downloaded_subtitles = None
             logging.info("BAZARR All providers are throttled")
@@ -339,8 +337,6 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
                                                provider_configs=providers_auth,
                                                throttle_callback=provider_throttle,
                                                language_hook=None)  # fixme
-                for provider in providers:
-                    track_event(category=provider, action='search', label=language_from_alpha3(lang))
             else:
                 subtitles = []
                 logging.info("BAZARR All providers are throttled")
diff --git a/bazarr/main.py b/bazarr/main.py
index 2fb0543fd..5eda8c3f8 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -197,6 +197,7 @@ def shutdown():
         else:
             stop_file.write('')
             stop_file.close()
+            sys.exit(0)
 
 
 @route(base_url + 'restart')
@@ -215,6 +216,7 @@ def restart():
             logging.info('Bazarr is being restarted...')
             restart_file.write('')
             restart_file.close()
+            sys.exit(0)
 
 
 @route(base_url + 'wizard')
diff --git a/views/menu.tpl b/views/menu.tpl
index 166a8c442..d8647cb2c 100644
--- a/views/menu.tpl
+++ b/views/menu.tpl
@@ -283,11 +283,11 @@
 		$('#loader_text').text("Bazarr is restarting. Please Wait...");
 		$.ajax({
 			url: "{{base_url}}restart",
-			async: true
+			async: true,
+			error: (function(){
+    			setTimeout(function(){ setInterval(ping, 2000); },8000);
+			})
 		})
-		.done(function(){
-    		setTimeout(function(){ setInterval(ping, 2000); },8000);
-		});
 	});
 
 	% from config import settings
diff --git a/views/system.tpl b/views/system.tpl
index 56a096c95..309067dbe 100644
--- a/views/system.tpl
+++ b/views/system.tpl
@@ -419,12 +419,12 @@
 	$('#restart').on('click', function(){
 		$('#loader_text').text("Bazarr is restarting, please wait...");
 		$.ajax({
-			url: "{{base_url}}restart",
-			async: true
-		})
-		.done(function(){
-    		setTimeout(function(){ setInterval(ping, 2000); },8000);
-		})
+            url: "{{base_url}}restart",
+            async: true,
+            error: (function () {
+                setTimeout(function () { setInterval(ping, 2000); }, 8000);
+            })
+        });
 	});
 
     % from config import settings