diff --git a/app/add.py b/app/add.py
index b55b66cd..c22e5bba 100644
--- a/app/add.py
+++ b/app/add.py
@@ -169,7 +169,7 @@ if form.getvalue('mode') is not None:
 			
 	waf = ""
 	if form.getvalue('waf') is not None:
-		waf = "    filter spoe engine modsecurity config "+haproxy_dir+"/spoe-modsecurity.conf\n"
+		waf = "    filter spoe engine modsecurity config "+haproxy_dir+"/waf.conf\n"
 		waf += "    http-request deny if { var(txn.modsec.code) -m int gt 0 }\n"
 	
 	config_add = name + "\n" + bind +  mode  + "\n" + balance + options_split + filter + compression_s + cache_s + waf + backend + servers_split + "\n" + cache_set
diff --git a/app/overview.py b/app/overview.py
index 9f950a15..91f1c163 100644
--- a/app/overview.py
+++ b/app/overview.py
@@ -26,7 +26,7 @@ try:
 	checker_worker, stderr = funct.subprocess_execute(cmd)
 	cmd = "ps ax |grep metrics_master |grep -v grep |wc -l"
 	metrics_master, stderr = funct.subprocess_execute(cmd)
-	cmd = "ps ax |grep metrics_worker |grep -v grep |wc -l"
+	cmd = "ps ax |grep -e 'metrics_worker\|metrics_waf_worker.py' |grep -v grep |wc -l"
 	metrics_worker, stderr = funct.subprocess_execute(cmd)
 except:
 	pass
diff --git a/app/tools/metrics_master.py b/app/tools/metrics_master.py
index e38c27e4..92859635 100644
--- a/app/tools/metrics_master.py
+++ b/app/tools/metrics_master.py
@@ -52,7 +52,7 @@ def kill_worker(serv):
 		funct.logging("localhost", stderr, metrics=1)
 
 def kill_all_workers():
-	cmd = "ps ax |grep 'tools/metrics_worker.py' |grep -v grep |awk '{print $1}' |xargs kill"
+	cmd = "ps ax |grep -e 'tools/metrics_worker.py\|tools/metrics_waf_worker.py' |grep -v grep |awk '{print $1}' |xargs kill"
 	output, stderr = funct.subprocess_execute(cmd)
 	funct.logging("localhost", " Masrer killing all metrics workers", metrics=1)
 	if stderr:
diff --git a/app/tools/metrics_worker.py b/app/tools/metrics_worker.py
index d0257291..99072c75 100644
--- a/app/tools/metrics_worker.py
+++ b/app/tools/metrics_worker.py
@@ -21,10 +21,8 @@ class GracefulKiller:
 def main(serv, port):
 	port = str(port)
 	firstrun = True
-	currentstat = []
 	readstats = ""
 	killer = GracefulKiller()
-	old_stat_service = ""
 	
 	while True:
 		try:			
@@ -49,7 +47,7 @@ def main(serv, port):
 			break
 
 if __name__ == "__main__":
-	parser = argparse.ArgumentParser(description='Metrics HAProxy service.', prog='check_haproxy.py', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+	parser = argparse.ArgumentParser(description='Metrics HAProxy service.', prog='metrics_worker.py', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 	
 	parser.add_argument('IP', help='Start get metrics from HAProxy service at this ip', nargs='?', type=str)
 	parser.add_argument('--port', help='Start get metrics from HAProxy service at this port', nargs='?', default=1999, type=int)