diff --git a/app/modules/common/common_classes.py b/app/modules/common/common_classes.py
index 1cb6710e..785f4431 100644
--- a/app/modules/common/common_classes.py
+++ b/app/modules/common/common_classes.py
@@ -21,7 +21,7 @@ class SupportClass:
                 raise e
         else:
             try:
-                server = server_sql.get_server_by_id(server_id)
+                server = server_sql.get_server(server_id)
             except Exception as e:
                 raise e
         try:
diff --git a/app/modules/config/add.py b/app/modules/config/add.py
index 84ddd465..5194434c 100644
--- a/app/modules/config/add.py
+++ b/app/modules/config/add.py
@@ -121,7 +121,7 @@ def save_bwlist(list_name: str, list_con: str, color: str, group: str, server_ip
 		except Exception:
 			pass
 
-		server_id = server_sql.select_server_id_by_ip(server_ip=serv)
+		server_id = server_sql.get_server_by_ip(serv).server_id
 		haproxy_service_name = service_common.get_correct_service_name('haproxy', server_id)
 
 		if action == 'restart':
@@ -239,7 +239,7 @@ def save_map(map_name: str, list_con: str, group: str, server_ip: str, action: s
 		except Exception:
 			pass
 
-		server_id = server_sql.select_server_id_by_ip(server_ip=serv)
+		server_id = server_sql.get_server_by_ip(serv).server_id
 		haproxy_service_name = service_common.get_correct_service_name('haproxy', server_id)
 
 		if action == 'restart':
diff --git a/app/modules/config/config.py b/app/modules/config/config.py
index 431ec953..92863571 100644
--- a/app/modules/config/config.py
+++ b/app/modules/config/config.py
@@ -207,7 +207,7 @@ def upload_and_restart(server_ip: str, cfg: str, just_save: str, service: str, *
 	"""
 	user = user_sql.get_user_id(g.user_params['user_id'])
 	config_path = kwargs.get('config_file_name')
-	server_id = server_sql.select_server_id_by_ip(server_ip=server_ip)
+	server_id = server_sql.get_server_by_ip(server_ip).server_id
 	tmp_file = f"{sql.get_setting('tmp_config_path')}/{get_date.return_date('config')}.{config_common.get_file_format(service)}"
 
 	if config_path and config_path != 'undefined':
diff --git a/app/modules/config/runtime.py b/app/modules/config/runtime.py
index 1ff9a0a7..838c3372 100644
--- a/app/modules/config/runtime.py
+++ b/app/modules/config/runtime.py
@@ -308,7 +308,7 @@ def change_maxconn_global(serv: str, maxconn: int) -> str:
 	for master in masters:
 		if master[0] is not None:
 			cmd = f'echo "set maxconn global {maxconn}" |nc {master[0]} {haproxy_sock_port}'
-			output, stderr = server_mod.subprocess_execute(cmd)
+			server_mod.subprocess_execute(cmd)
 		roxywi_common.logging(master[0], f'Maxconn has been changed. Globally to {maxconn}', login=1, keep_history=1, service='haproxy')
 
 	cmd = f'echo "set maxconn global {maxconn}" |nc {serv} {haproxy_sock_port}'
@@ -340,7 +340,7 @@ def change_maxconn_frontend(serv, maxconn, frontend) -> str:
 	for master in masters:
 		if master[0] is not None:
 			cmd = f'echo "set maxconn frontend {frontend} {maxconn}" |nc {master[0]} {haproxy_sock_port}'
-			output, stderr = server_mod.subprocess_execute(cmd)
+			server_mod.subprocess_execute(cmd)
 		roxywi_common.logging(master[0], f'Maxconn has been changed. On: {frontend} to {maxconn}', login=1, keep_history=1, service='haproxy')
 
 	cmd = f'echo "set maxconn frontend {frontend} {maxconn}" |nc {serv} {haproxy_sock_port}'
@@ -419,11 +419,9 @@ def delete_ip_from_stick_table(serv, ip, table) -> str:
 
 	cmd = f'echo "clear table {table} key {ip}" |nc {serv} {haproxy_sock_port}'
 	output, stderr = server_mod.subprocess_execute(cmd)
-	try:
-		if stderr[0] != '':
-			return f'error: {stderr[0]}'
-	except Exception:
-		return 'ok'
+	if stderr != '':
+		return f'error: {stderr[0]}'
+	return 'ok'
 
 
 def clear_stick_table(serv, table) -> str:
@@ -431,11 +429,9 @@ def clear_stick_table(serv, table) -> str:
 
 	cmd = f'echo "clear table {table} " |nc {serv} {haproxy_sock_port}'
 	output, stderr = server_mod.subprocess_execute(cmd)
-	try:
-		if stderr[0] != '':
-			return f'error: {stderr[0]}'
-	except Exception:
-		return 'ok'
+	if stderr != '':
+		return f'error: {stderr[0]}'
+	return 'ok'
 
 
 def list_of_lists(serv) -> dict:
@@ -477,16 +473,10 @@ def delete_ip_from_list(serv, ip_id, ip, list_id, list_name) -> str:
 	output, stderr = server_mod.subprocess_execute(cmd)
 
 	roxywi_common.logging(serv, f'{ip_id} has been delete from list {list_id}', login=1, keep_history=1, service='haproxy')
-	try:
-		if output[0] != '':
-			return f'error: {output[0]}'
-	except Exception:
-		pass
-	try:
-		if stderr != '':
-			return f'error: {stderr[0]}'
-	except Exception:
-		pass
+	if output[0] != '':
+		return f'error: {output[0]}'
+	if stderr != '':
+		return f'error: {stderr[0]}'
 
 	return 'ok'
 
@@ -497,16 +487,10 @@ def add_ip_to_list(serv, ip, list_id, list_name) -> str:
 	user_group = roxywi_common.get_user_group(id=1)
 	cmd = f'echo "add acl #{list_id} {ip}" |nc {serv} {haproxy_sock_port}'
 	output, stderr = server_mod.subprocess_execute(cmd)
-	try:
-		if output[0]:
-			return f'error: {output[0]}'
-	except Exception:
-		pass
-	try:
-		if stderr:
-			return f'error: {stderr[0]}'
-	except Exception:
-		pass
+	if output[0]:
+		return f'error: {output[0]}'
+	if stderr:
+		return f'error: {stderr[0]}'
 
 	if 'is not a valid IPv4 or IPv6 address' not in output[0]:
 		cmd = f'echo "{ip}" >> {lib_path}/lists/{user_group}/{list_name}'
diff --git a/app/modules/db/config.py b/app/modules/db/config.py
index 2fc53a92..2272db5f 100644
--- a/app/modules/db/config.py
+++ b/app/modules/db/config.py
@@ -1,5 +1,5 @@
 from app.modules.db.db_model import ConfigVersion
-from app.modules.db.server import select_server_id_by_ip
+from app.modules.db.server import get_server_by_ip
 from app.modules.db.common import out_error
 import app.modules.roxy_wi_tools as roxy_wi_tools
 
@@ -22,7 +22,7 @@ def insert_config_version(server_id: int, user_id: int, service: str, local_path
 
 
 def select_config_version(server_ip: str, service: str) -> str:
-	server_id = select_server_id_by_ip(server_ip)
+	server_id = get_server_by_ip(server_ip).server_id
 	query = ConfigVersion.select().where(
 		(ConfigVersion.server_id == server_id)
 		& (ConfigVersion.service == service)
@@ -50,7 +50,7 @@ def delete_config_version(service: str, local_path: str):
 
 
 def select_remote_path_from_version(server_ip: str, service: str, local_path: str):
-	server_id = select_server_id_by_ip(server_ip)
+	server_id = get_server_by_ip(server_ip).server_id
 	try:
 		query_res = ConfigVersion.get(
 			(ConfigVersion.server_id == server_id)
diff --git a/app/modules/db/cred.py b/app/modules/db/cred.py
index 05ce66d3..2c5200ef 100644
--- a/app/modules/db/cred.py
+++ b/app/modules/db/cred.py
@@ -73,15 +73,6 @@ def update_ssh_passphrase(cred_id: int, passphrase: str):
 		out_error(e)
 
 
-def get_ssh_by_id_and_group(cred_id: int, group_id: int) -> Cred:
-	try:
-		return Cred.select().where((Cred.group_id == group_id) & (Cred.id == cred_id)).execute()
-	except Cred.DoesNotExist:
-		raise RoxywiResourceNotFound
-	except Exception as e:
-		out_error(e)
-
-
 def get_ssh(ssh_id: int) -> Cred:
 	try:
 		return Cred.get(Cred.id == ssh_id)
diff --git a/app/modules/db/roxy.py b/app/modules/db/roxy.py
index 15023a74..a4848eef 100644
--- a/app/modules/db/roxy.py
+++ b/app/modules/db/roxy.py
@@ -9,16 +9,6 @@ def insert_user_name(user_name):
 		pass
 
 
-def update_user_name(user_name):
-	try:
-		UserName.update(UserName=user_name).execute()
-	except Exception as e:
-		out_error(e)
-		return False
-	else:
-		return True
-
-
 def update_user_status(status, plan, method):
 	try:
 		UserName.update(Status=status, Method=method, Plan=plan).execute()
diff --git a/app/modules/db/server.py b/app/modules/db/server.py
index 05b36f4f..a7b40572 100644
--- a/app/modules/db/server.py
+++ b/app/modules/db/server.py
@@ -35,7 +35,7 @@ def update_server(hostname, ip, group, type_ip, enable, master, server_id, cred,
 		out_error(e)
 
 
-def get_server_by_id(server_id: int) -> Server:
+def get_server(server_id: int) -> Server:
 	try:
 		return Server.get(Server.server_id == server_id)
 	except DoesNotExist:
@@ -100,13 +100,10 @@ def select_os_info(server_id):
 
 
 def update_firewall(serv):
-	query = Server.update(firewall_enable=1).where(Server.ip == serv)
 	try:
-		query.execute()
-		return True
+		Server.update(firewall_enable=1).where(Server.ip == serv).execute()
 	except Exception as e:
 		out_error(e)
-		return False
 
 
 def return_firewall(serv):
@@ -119,9 +116,8 @@ def return_firewall(serv):
 
 
 def update_server_pos(pos, server_id) -> str:
-	query = Server.update(pos=pos).where(Server.server_id == server_id)
 	try:
-		query.execute()
+		Server.update(pos=pos).where(Server.server_id == server_id).execute()
 		return 'ok'
 	except Exception as e:
 		out_error(e)
@@ -136,24 +132,6 @@ def is_serv_protected(serv):
 		return True if query_res.protected else False
 
 
-def select_server_ip_by_id(server_id: int) -> str:
-	try:
-		server_ip = Server.get(Server.server_id == server_id).ip
-	except Exception as e:
-		return out_error(e)
-	else:
-		return server_ip
-
-
-def select_server_id_by_ip(server_ip):
-	try:
-		server_id = Server.get(Server.ip == server_ip).server_id
-	except Exception:
-		return None
-	else:
-		return server_id
-
-
 def select_servers(**kwargs):
 	conn = connect()
 	cursor = conn.cursor()
diff --git a/app/modules/db/service.py b/app/modules/db/service.py
index bda636eb..45bf64bd 100644
--- a/app/modules/db/service.py
+++ b/app/modules/db/service.py
@@ -170,13 +170,6 @@ def update_keepalived(serv):
 		out_error(e)
 
 
-def select_apache(serv):
-	try:
-		return Server.get(Server.ip == serv).apache
-	except Exception as e:
-		out_error(e)
-
-
 def update_apache(serv: str) -> None:
 	try:
 		Server.update(apache='1').where(Server.ip == serv).execute()
@@ -184,13 +177,6 @@ def update_apache(serv: str) -> None:
 		out_error(e)
 
 
-def select_nginx(serv):
-	try:
-		return Server.get(Server.ip == serv).nginx
-	except Exception as e:
-		out_error(e)
-
-
 def update_nginx(serv: str) -> None:
 	try:
 		Server.update(nginx=1).where(Server.ip == serv).execute()
@@ -198,15 +184,6 @@ def update_nginx(serv: str) -> None:
 		out_error(e)
 
 
-def select_haproxy(serv):
-	try:
-		query_res = Server.get(Server.ip == serv).haproxy
-	except Exception as e:
-		out_error(e)
-	else:
-		return query_res
-
-
 def update_haproxy(serv):
 	try:
 		Server.update(haproxy=1).where(Server.ip == serv).execute()
@@ -214,15 +191,6 @@ def update_haproxy(serv):
 		out_error(e)
 
 
-def select_keepalived(serv):
-	try:
-		keepalived = Server.get(Server.ip == serv).keepalived
-	except Exception as e:
-		out_error(e)
-	else:
-		return keepalived
-
-
 def select_count_services(service: str) -> int:
 	try:
 		if service == 'haproxy':
diff --git a/app/modules/roxywi/overview.py b/app/modules/roxywi/overview.py
index c3ee4eb1..173408d4 100644
--- a/app/modules/roxywi/overview.py
+++ b/app/modules/roxywi/overview.py
@@ -49,10 +49,10 @@ def show_overview(serv) -> str:
     server = server_sql.get_server_by_ip(serv)
     user_services = user_sql.select_user_services(claims['user_id'])
 
-    haproxy = service_sql.select_haproxy(serv) if '1' in user_services else 0
-    nginx = service_sql.select_nginx(serv) if '2' in user_services else 0
-    keepalived = service_sql.select_keepalived(serv) if '3' in user_services else 0
-    apache = service_sql.select_apache(serv) if '4' in user_services else 0
+    haproxy = server.apache if '1' in user_services else 0
+    nginx = server.nginx if '2' in user_services else 0
+    keepalived = server.keepalived if '3' in user_services else 0
+    apache = server.apache if '4' in user_services else 0
 
     waf = waf_sql.select_waf_servers(server.ip)
     haproxy_process = ''
@@ -200,8 +200,8 @@ def show_services_overview():
         for s in user_params['servers']:
             servers_group.append(s[2])
 
-    is_checker_worker = len(checker_sql.select_all_alerts(group=user_group))
-    is_metrics_worker = len(metric_sql.select_servers_metrics_for_master(group=user_group))
+    is_checker_worker = len(checker_sql.select_all_alerts(user_group))
+    is_metrics_worker = len(metric_sql.select_servers_metrics_for_master(user_group))
 
     for pids in psutil.pids():
         if pids < 300:
diff --git a/app/modules/roxywi/waf.py b/app/modules/roxywi/waf.py
index 451a700c..a9c089bd 100644
--- a/app/modules/roxywi/waf.py
+++ b/app/modules/roxywi/waf.py
@@ -4,7 +4,6 @@ import app.modules.db.sql as sql
 import app.modules.db.waf as waf_sql
 import app.modules.db.user as user_sql
 import app.modules.db.server as server_sql
-import app.modules.db.service as service_sql
 import app.modules.common.common as common
 import app.modules.server.server as server_mod
 import app.modules.roxywi.common as roxywi_common
@@ -21,9 +20,9 @@ def waf_overview(serv: str, waf_service: str, claims: dict) -> str:
     is_waf_on_server = 0
 
     if waf_service == 'haproxy':
-        is_waf_on_server = service_sql.select_haproxy(server.ip)
+        is_waf_on_server = server.haproxy
     elif waf_service == 'nginx':
-        is_waf_on_server = service_sql.select_nginx(server.ip)
+        is_waf_on_server = server.nginx
 
     if is_waf_on_server == 1:
         config_path = sql.get_setting(f'{waf_service}_dir')
@@ -70,7 +69,7 @@ def waf_overview(serv: str, waf_service: str, claims: dict) -> str:
 
 
 def change_waf_mode(waf_mode: str, server_id: int, service: str):
-    serv = server_sql.get_server_by_id(server_id)
+    serv = server_sql.get_server(server_id)
 
     if service == 'haproxy':
         config_dir = sql.get_setting('haproxy_dir')
diff --git a/app/modules/server/server.py b/app/modules/server/server.py
index 56461883..1c9cc05c 100644
--- a/app/modules/server/server.py
+++ b/app/modules/server/server.py
@@ -112,7 +112,7 @@ def get_system_info(server_ip: str) -> None:
 	if server_ip == '':
 		raise Exception('IP cannot be empty')
 
-	server_id = server_sql.select_server_id_by_ip(server_ip)
+	server_id = server_sql.get_server_by_ip(server_ip).server_id
 	command = "sudo lshw -quiet -json"
 	command1 = 'sudo hostnamectl |grep "Operating System"|awk -F":" \'{print $2}\''
 
@@ -459,7 +459,7 @@ def update_server_after_creating(hostname: str, ip: str) -> None:
 
 
 def delete_server(server_id: int) -> None:
-	server = server_sql.get_server_by_id(server_id)
+	server = server_sql.get_server(server_id)
 
 	if backup_sql.check_exists_backup(server.ip, 'fs'):
 		raise 'warning: Delete the backups first'
diff --git a/app/modules/service/action.py b/app/modules/service/action.py
index c5440678..cf75ff39 100644
--- a/app/modules/service/action.py
+++ b/app/modules/service/action.py
@@ -34,7 +34,7 @@ def service_action(server_ip: str, action: str, service: str) -> None:
         service_common.is_protected(server_ip, action)
     except Exception as e:
         raise e
-    server_id = server_sql.select_server_id_by_ip(server_ip=server_ip)
+    server_id = server_sql.get_server_by_ip(server_ip).server_id
 
     if service_common.is_not_allowed_to_restart(server_id, service, action):
         raise Exception('This server is not allowed to be restarted')
diff --git a/app/modules/service/backup.py b/app/modules/service/backup.py
index 6033ce83..79e31bd5 100644
--- a/app/modules/service/backup.py
+++ b/app/modules/service/backup.py
@@ -13,7 +13,7 @@ from app.modules.roxywi.exception import RoxywiConflictError
 
 
 def create_backup_inv(json_data: BackupRequest, del_id: int = 0) -> None:
-    server = server_sql.get_server_by_id(json_data.server_id)
+    server = server_sql.get_server(json_data.server_id)
     ssh_settings = ssh_mod.return_ssh_keys_path(server.ip, json_data.cred_id)
     inv = {"server": {"hosts": {}}}
     server_ips = []
@@ -36,7 +36,7 @@ def create_backup_inv(json_data: BackupRequest, del_id: int = 0) -> None:
 
 
 def create_s3_backup_inv(data: S3BackupRequest, tag: str) -> None:
-    server = server_sql.get_server_by_id(data.server_id)
+    server = server_sql.get_server(data.server_id)
     inv = {"server": {"hosts": {}}}
     inv["server"]["hosts"]["localhost"] = {
         "SERVER": server.hostname,
@@ -142,7 +142,7 @@ def delete_s3_backup(data: S3BackupRequest, backup_id: int) -> None:
 
 
 def create_git_backup(data: GitBackupRequest, is_api: bool) -> tuple:
-    server_ip = server_sql.select_server_ip_by_id(data.server_id)
+    server_ip = server_sql.get_server(data.server_id).ip
     service_name = service_sql.select_service_name_by_id(data.service_id).lower()
     try:
         create_git_backup_inv(data, server_ip, service_name)
@@ -174,7 +174,7 @@ def create_git_backup(data: GitBackupRequest, is_api: bool) -> tuple:
 
 
 def delete_git_backup(data: GitBackupRequest, backup_id: int) -> tuple:
-    server_ip = server_sql.select_server_ip_by_id(data.server_id)
+    server_ip = server_sql.get_server(data.server_id).ip
     service_name = service_sql.select_service_name_by_id(data.service_id).lower()
     try:
         create_git_backup_inv(data, server_ip, service_name, 1)
diff --git a/app/modules/service/common.py b/app/modules/service/common.py
index 67c449b0..410cd43a 100644
--- a/app/modules/service/common.py
+++ b/app/modules/service/common.py
@@ -97,7 +97,7 @@ def get_exp_version(server_ip: str, service_name: str) -> str:
 
 def get_correct_apache_service_name(server_ip=None, server_id=None) -> str:
 	if server_id is None:
-		server_id = server_sql.select_server_id_by_ip(server_ip)
+		server_id = server_sql.get_server_by_ip(server_ip).server_id
 
 	try:
 		os_info = server_sql.select_os_info(server_id)
diff --git a/app/modules/service/ha_cluster.py b/app/modules/service/ha_cluster.py
index faeb5c25..e5a14713 100644
--- a/app/modules/service/ha_cluster.py
+++ b/app/modules/service/ha_cluster.py
@@ -123,7 +123,7 @@ def delete_cluster(cluster_id: int) -> None:
     slaves = ha_sql.select_cluster_slaves(cluster_id, router_id)
 
     for slave in slaves:
-        slave_ip = server_sql.select_server_ip_by_id(slave[0])
+        slave_ip = server_sql.get_server(slave[0]).ip
         try:
             ha_sql.update_master_server_by_slave_ip(0, slave_ip)
         except Exception as e:
@@ -149,7 +149,7 @@ def update_vip(cluster_id: int, router_id: int, cluster: Union[HAClusterRequest,
         try:
             ha_sql.update_slave(cluster_id, value['id'], value['eth'], value['master'], router_id)
         except Exception as e:
-            s = server_sql.get_server_by_id(value['id'])
+            s = server_sql.get_server(value['id'])
             raise Exception(f'error: Cannot add server {s.hostname}: {e}')
 
     if cluster.virt_server:
@@ -199,7 +199,7 @@ def insert_vip(cluster_id: int, cluster: HAClusterVIP, group_id: int) -> int:
         try:
             ha_sql.insert_or_update_slave(cluster_id, value['id'], value['eth'], value['master'], router_id)
         except Exception as e:
-            s = server_sql.get_server_by_id(value['id'])
+            s = server_sql.get_server(value['id'])
             raise Exception(f'error: Cannot add server {s.hostname}: {e}')
 
     if cluster.virt_server:
@@ -280,7 +280,7 @@ def add_or_update_virt(cluster: Union[HAClusterRequest, HAClusterVIP], servers:
             roxywi_common.logging(cluster_id, f'Cannot update cluster virtual server for VIP {vip}: {e}', roxywi=1, service='HA cluster')
     else:
         try:
-            server = server_sql.get_server_by_id(master_id)
+            server = server_sql.get_server(master_id)
             c = ha_sql.get_cluster(cluster_id)
             kwargs.setdefault('cred_id', server.cred_id)
             kwargs.setdefault('hostname', f'{vip}-VIP')
@@ -304,7 +304,7 @@ def add_or_update_virt(cluster: Union[HAClusterRequest, HAClusterVIP], servers:
 
 def _create_or_update_master_slaves_servers(cluster_id: int, servers: dict, router_id: int, create: bool = False) -> None:
     for server in servers:
-        s = server_sql.get_server_by_id(server['id'])
+        s = server_sql.get_server(server['id'])
         try:
             ha_sql.insert_or_update_slave(cluster_id, server['id'], server['eth'], server['master'], router_id)
             if create:
diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py
index 8876c45d..912d85f9 100644
--- a/app/modules/service/installation.py
+++ b/app/modules/service/installation.py
@@ -29,7 +29,7 @@ def generate_udp_inv(listener_id: int, action: str) -> object:
 	if listener['cluster_id']:
 		server_ips = udp_mod.get_slaves_for_udp_listener(listener['cluster_id'], listener['vip'])
 	elif listener['server_id']:
-		server = server_sql.get_server_by_id(listener['server_id'])
+		server = server_sql.get_server(listener['server_id'])
 		server_ips.append(server.ip)
 	for server_ip in server_ips:
 		inv['server']['hosts'][server_ip] = {
@@ -82,13 +82,13 @@ def generate_kp_inv(json_data: json, installed_service) -> object:
 		routers[router_id].setdefault('use_src', vip.use_src)
 		slaves = ha_sql.select_cluster_slaves_for_inv(router_id)
 		for slave in slaves:
-			slave_ip = server_sql.select_server_ip_by_id(str(slave.server_id))
+			slave_ip = server_sql.get_server(int(slave.server_id)).ip
 			routers[router_id].setdefault(slave_ip, dict())
 			routers[router_id][slave_ip].setdefault('master', slave.master)
 			routers[router_id][slave_ip].setdefault('eth', slave.eth)
 
 	for v in json_data['servers']:
-		s = server_sql.get_server_by_id(v['id'])
+		s = server_sql.get_server(v['id'])
 		inv['server']['hosts'][s.ip] = {
 			"HAPROXY": haproxy,
 			"NGINX": nginx,
@@ -131,7 +131,7 @@ def generate_haproxy_inv(json_data: ServiceInstall, installed_service: str) -> o
 	is_docker = json_data['services']['haproxy']['docker']
 
 	for v in json_data['servers']:
-		s = server_sql.get_server_by_id(v['id'])
+		s = server_sql.get_server(v['id'])
 		if not v['master']:
 			slaves.append(s.ip)
 		else:
@@ -203,7 +203,7 @@ def generate_service_inv(json_data: ServiceInstall, installed_service: str) -> o
 		os.system('ansible-galaxy install nginxinc.nginx,0.24.3 -f --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/')
 
 	for v in json_data['servers']:
-		s = server_sql.get_server_by_id(v['id'])
+		s = server_sql.get_server(v['id'])
 		if installed_service == 'apache':
 			correct_service_name = service_common.get_correct_apache_service_name(server_id=v['id'])
 			if service_dir == '/etc/httpd' and correct_service_name == 'apache2':
@@ -391,7 +391,7 @@ def service_actions_after_install(server_ips: str, service: str, json_data) -> N
 	}
 
 	for server_ip in server_ips:
-		server_id = server_sql.select_server_id_by_ip(server_ip)
+		server_id = server_sql.get_server_by_ip(server_ip).server_id
 		try:
 			update_functions[service](server_ip)
 		except Exception as e:
diff --git a/app/modules/service/udp.py b/app/modules/service/udp.py
index 7c5457ca..2a404c02 100644
--- a/app/modules/service/udp.py
+++ b/app/modules/service/udp.py
@@ -39,7 +39,7 @@ def _return_listener_servers(listener_id: int, group_id=None):
     if listener.cluster_id:
         servers = get_slaves_for_udp_listener(listener.cluster_id, listener.vip)
     elif listener.server_id:
-        server = server_sql.get_server_by_id(listener.server_id)
+        server = server_sql.get_server(listener.server_id)
         servers.append(server.ip)
     if len(servers) < 1:
         raise ValueError("error: Cannot find server")
diff --git a/app/modules/tools/alerting.py b/app/modules/tools/alerting.py
index e6c9536d..b5427092 100644
--- a/app/modules/tools/alerting.py
+++ b/app/modules/tools/alerting.py
@@ -54,7 +54,7 @@ def alert_routing(
 ) -> None:
 	try:
 		subject: str = level + ': ' + mes
-		server_id: int = server_sql.select_server_id_by_ip(server_ip)
+		server_id: int = server_sql.get_server_by_ip(server_ip).server_id
 		checker_settings = checker_sql.select_checker_settings_for_server(service_id, server_id)
 	except Exception as e:
 		raise Exception(f'Cannot get settings: {e}')
diff --git a/app/modules/tools/smon_agent.py b/app/modules/tools/smon_agent.py
index e1c31f4e..8131827f 100644
--- a/app/modules/tools/smon_agent.py
+++ b/app/modules/tools/smon_agent.py
@@ -41,7 +41,7 @@ def check_agent_limit():
 def add_agent(data) -> int:
     name = common.checkAjaxInput(data.get("name"))
     server_id = int(data.get("server_id"))
-    server_ip = server_sql.select_server_ip_by_id(server_id)
+    server_ip = server_sql.get_server(server_id).ip
     desc = common.checkAjaxInput(data.get("desc"))
     enabled = int(data.get("enabled"))
     agent_uuid = str(uuid.uuid4())
diff --git a/app/routes/add/routes.py b/app/routes/add/routes.py
index 1c2d2263..d432a632 100644
--- a/app/routes/add/routes.py
+++ b/app/routes/add/routes.py
@@ -229,7 +229,7 @@ def get_certs(server_ip):
     if isinstance(server_ip, str):
         server_ip = common.is_ip_or_dns(server_ip)
     elif isinstance(server_ip, int):
-        server = server_sql.get_server_by_id(server_ip)
+        server = server_sql.get_server(server_ip)
         server_ip = server.ip
     return add_mod.get_ssl_certs(server_ip)
 
diff --git a/app/routes/config/routes.py b/app/routes/config/routes.py
index 557b9567..84657c50 100644
--- a/app/routes/config/routes.py
+++ b/app/routes/config/routes.py
@@ -99,7 +99,7 @@ def config(service, serv, edit, config_file_name, new):
     if serv and edit and new_config is None:
         roxywi_common.check_is_server_in_group(serv)
         is_serv_protected = server_sql.is_serv_protected(serv)
-        server_id = server_sql.select_server_id_by_ip(serv)
+        server_id = server_sql.get_server_by_ip(serv).server_id
         is_restart = service_sql.select_service_setting(server_id, service, 'restart')
         cfg = config_mod.return_cfg(service, serv, config_file_name)
 
@@ -233,7 +233,7 @@ def haproxy_section_show(server_ip, section):
     cfg = config_common.generate_config_path('haproxy', server_ip)
     error = config_mod.get_config(server_ip, cfg)
     start_line, end_line, config_read = section_mod.get_section_from_config(cfg, section)
-    server_id = server_sql.select_server_id_by_ip(server_ip)
+    server_id = server_sql.get_server_by_ip(server_ip).server_id
     sections = section_mod.get_sections(cfg)
 
     os.system(f"/bin/mv {cfg} {cfg}.old")
diff --git a/app/routes/ha/routes.py b/app/routes/ha/routes.py
index 8bd1444a..6b92a097 100644
--- a/app/routes/ha/routes.py
+++ b/app/routes/ha/routes.py
@@ -70,10 +70,10 @@ def show_ha_cluster(service, cluster_id):
         servers_with_status.append(s[1])
         servers_with_status.append(s[2])
         servers_with_status.append(s[11])
-        servers_with_status.append(server_sql.is_master(s[2]))
         servers_with_status.append(server_sql.select_servers(server=s[2]))
+        servers_with_status.append(server_sql.is_master(s[2]))
 
-        is_keepalived = service_sql.select_keepalived(s[2])
+        is_keepalived = s[13]
 
         if is_keepalived:
             try:
diff --git a/app/routes/main/routes.py b/app/routes/main/routes.py
index 30435506..20fc33aa 100644
--- a/app/routes/main/routes.py
+++ b/app/routes/main/routes.py
@@ -204,11 +204,11 @@ def service_history(service, server_ip):
         if service in ('cluster', 'udp'):
             server_id = server_ip
         else:
-            server_id = server_sql.select_server_id_by_ip(server_ip)
+            server_id = server_sql.get_server_by_ip(server_ip).server_id
         history = history_sql.select_action_history_by_server_id_and_service(server_id, service_desc.service)
     elif service == 'server':
         if roxywi_common.check_is_server_in_group(server_ip):
-            server_id = server_sql.select_server_id_by_ip(server_ip)
+            server_id = server_sql.get_server_by_ip(server_ip).server_id
             history = history_sql.select_action_history_by_server_id(server_id)
     elif service == 'user':
         history = history_sql.select_action_history_by_user_id(server_ip)
diff --git a/app/routes/portscanner/routes.py b/app/routes/portscanner/routes.py
index 39b9b533..c2529348 100644
--- a/app/routes/portscanner/routes.py
+++ b/app/routes/portscanner/routes.py
@@ -64,7 +64,7 @@ def change_settings_portscanner():
     enabled = int(request.form.get('enabled'))
     notify = int(request.form.get('notify'))
     history = int(request.form.get('history'))
-    server = server_sql.get_server_by_id(server_id)
+    server = server_sql.get_server(server_id)
 
     try:
         ps_sql.insert_port_scanner_settings(server_id, server.group_id, enabled, notify, history)
@@ -77,7 +77,7 @@ def change_settings_portscanner():
 def scan_port():
     json_data = request.get_json()
     if 'id' in json_data:
-        ip = server_sql.select_server_ip_by_id(int(json_data['id']))
+        ip = server_sql.get_server(int(json_data['id'])).ip
     else:
         ip = common.is_ip_or_dns(json_data['ip'])
 
diff --git a/app/routes/runtime/routes.py b/app/routes/runtime/routes.py
index cfc369b7..4cf33b6d 100644
--- a/app/routes/runtime/routes.py
+++ b/app/routes/runtime/routes.py
@@ -28,7 +28,7 @@ def show_backends(server_ip):
     if isinstance(server_ip, str):
         server_ip = common.is_ip_or_dns(server_ip)
     elif isinstance(server_ip, int):
-        server = server_sql.get_server_by_id(server_ip)
+        server = server_sql.get_server(server_ip)
         server_ip = server.ip
     try:
         return runtime.show_backends(server_ip)
diff --git a/app/routes/server/routes.py b/app/routes/server/routes.py
index dabc8eee..6080e486 100644
--- a/app/routes/server/routes.py
+++ b/app/routes/server/routes.py
@@ -60,7 +60,7 @@ def check_ssh(server_ip):
 @bp.route('/check/server/<int:server_id>')
 def check_server(server_id):
     try:
-        server = server_sql.get_server_by_id(server_id)
+        server = server_sql.get_server(server_id)
     except Exception as e:
         return roxywi_common.handler_exceptions_for_json_data(e)
     result = server_mod.server_is_up(server.ip)
diff --git a/app/routes/service/routes.py b/app/routes/service/routes.py
index a0aed222..66ff0ddc 100644
--- a/app/routes/service/routes.py
+++ b/app/routes/service/routes.py
@@ -60,7 +60,7 @@ def services(service, serv):
         if roxywi_common.check_is_server_in_group(serv):
             servers = server_sql.select_servers(server=serv)
             waf_server = waf_sql.select_waf_servers(serv)
-            server_id = server_sql.select_server_id_by_ip(serv)
+            server_id = server_sql.get_server_by_ip(serv).server_id
             docker_settings = service_sql.select_docker_service_settings(server_id, service_desc.slug)
             restart_settings = service_sql.select_restart_service_settings(server_id, service_desc.slug)
         else:
@@ -89,7 +89,7 @@ def services(service, serv):
         servers_with_status.append(s[2])
         servers_with_status.append(s[11])
         servers_with_status.append(server_sql.select_servers(server=s[2]))
-        is_keepalived = service_sql.select_keepalived(s[2])
+        is_keepalived = s[13]
 
         if is_keepalived:
             try:
@@ -215,11 +215,11 @@ def show_service_settings(service, server_id):
 @bp.post('/settings/<service>')
 @check_services
 def save_service_settings(service):
-    server_id = common.checkAjaxInput(request.form.get('serverSettingsSave'))
-    haproxy_enterprise = common.checkAjaxInput(request.form.get('serverSettingsEnterprise'))
-    service_dockerized = common.checkAjaxInput(request.form.get('serverSettingsDockerized'))
-    service_restart = common.checkAjaxInput(request.form.get('serverSettingsRestart'))
-    server_ip = server_sql.select_server_ip_by_id(server_id)
+    server_id = int(request.form.get('serverSettingsSave'))
+    haproxy_enterprise = int(request.form.get('serverSettingsEnterprise'))
+    service_dockerized = int(request.form.get('serverSettingsDockerized'))
+    service_restart = int(request.form.get('serverSettingsRestart'))
+    server_ip = server_sql.get_server(server_id).ip
     service_docker = f'Service {service.title()} has been flagged as a dockerized'
     service_systemd = f'Service {service.title()} has been flagged as a system service'
     disable_restart = f'Restart option is disabled for {service.title()} service'
@@ -252,13 +252,13 @@ def save_service_settings(service):
 @bp.post('/<service>/tools/update')
 @check_services
 def update_tools_enable(service):
-    server_id = request.form.get('server_id')
+    server_id = int(request.form.get('server_id'))
     active = request.form.get('active')
     name = request.form.get('name')
     alert = request.form.get('alert_en')
     metrics = request.form.get('metrics')
     service_sql.update_hapwi_server(server_id, alert, metrics, active, service)
-    server_ip = server_sql.select_server_ip_by_id(server_id)
+    server_ip = server_sql.get_server(server_id).ip
     roxywi_common.logging(server_ip, f'The server {name} has been updated ', roxywi=1, login=1, keep_history=1,
                           service=service)
 
diff --git a/app/static/js/runtimeapi.js b/app/static/js/runtimeapi.js
index 94e85f8f..a17a60ca 100644
--- a/app/static/js/runtimeapi.js
+++ b/app/static/js/runtimeapi.js
@@ -321,7 +321,7 @@ function getTable() {
 				$("input[type=submit], button").button();
 				$.getScript(script);
 				$.getScript(overview);
-				FontAwesomeConfig = {searchPseudoElements: true, observeMutations: false};
+				$.getScript(awesome);
 			}
 		}
 	});
@@ -339,7 +339,7 @@ function getList() {
 				$("input[type=submit], button").button();
 				$.getScript(script);
 				$.getScript(overview);
-				FontAwesomeConfig = {searchPseudoElements: true, observeMutations: false};
+				$.getScript(awesome);
 			}
 		}
 	});
@@ -409,7 +409,7 @@ function getSessions() {
 				$("input[type=submit], button").button();
 				$.getScript(script);
 				$.getScript(overview);
-				FontAwesomeConfig = {searchPseudoElements: true, observeMutations: false};
+				$.getScript(awesome);
 			}
 		}
 	});
diff --git a/app/static/js/script.js b/app/static/js/script.js
index ada2bbd7..008f25a3 100644
--- a/app/static/js/script.js
+++ b/app/static/js/script.js
@@ -141,8 +141,9 @@ function openVersions() {
 function showLog() {
 	let waf = cur_url[0].split('?')[0];
 	let file = $('#log_files').val();
+	if (!checkIsServerFiled('#serv')) return false;
 	let serv = $("#serv").val();
-	if ((file === undefined || file === null) && (waf === '' || waf === undefined)) {
+	if ((file === undefined || file === null || file === 'Select a file') && (waf === '' || waf === undefined)) {
 		let file_from_get = findGetParameter('file');
 		if (file_from_get === undefined || file_from_get === null) {
 			toastr.warning('Select a log file first')
@@ -151,6 +152,11 @@ function showLog() {
 			file = file_from_get;
 		}
 	}
+	if (file === undefined || file === null) {
+		toastr.warning('Select a log file first')
+		return false;
+
+	}
 	let rows = $('#rows').val();
 	let grep = $('#grep').val();
 	let exgrep = $('#exgrep').val();
diff --git a/app/views/server/backup_vews.py b/app/views/server/backup_vews.py
index 84290c76..9fc709af 100644
--- a/app/views/server/backup_vews.py
+++ b/app/views/server/backup_vews.py
@@ -633,7 +633,7 @@ class GitBackupView(MethodView):
             description: Unexpected error
         """
         try:
-            server = server_sql.get_server_by_id(body.server_id)
+            server = server_sql.get_server(body.server_id)
             service_name = service_sql.select_service_name_by_id(body.service_id).lower()
             backup_mod.create_git_backup_inv(body, server.ip, service_name)
             backup_sql.update_backup_job(backup_id, 'git', **body.model_dump(mode='json', exclude={'init'}))
diff --git a/app/views/server/views.py b/app/views/server/views.py
index 7d1569b2..9eedf4ff 100644
--- a/app/views/server/views.py
+++ b/app/views/server/views.py
@@ -286,7 +286,7 @@ class ServerView(MethodView):
                 body.hostname, body.ip, group_id, body.type_ip, body.enabled, body.master, server_id, body.cred_id, body.port, body.description,
                 body.firewall_enable, body.protected
             )
-            server_ip = server_sql.select_server_ip_by_id(server_id)
+            server_ip = server_sql.get_server(server_id).ip
             roxywi_common.logging(server_ip, f'The server {body.hostname} has been update', roxywi=1, login=1, keep_history=1, service='server')
         except Exception as e:
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot update server')
diff --git a/app/views/service/lets_encrypt_views.py b/app/views/service/lets_encrypt_views.py
index 37dfafa8..fd25a5a9 100644
--- a/app/views/service/lets_encrypt_views.py
+++ b/app/views/service/lets_encrypt_views.py
@@ -264,12 +264,12 @@ class LetsEncryptView(MethodView):
         ssl_path = common.return_nice_path(sql.get_setting('cert_path'), is_service=0)
 
         if data.type == 'standalone':
-            server_ip = server_sql.get_server_by_id(data.server_id).ip
+            server_ip = server_sql.get_server(data.server_id).ip
             ssh_settings = return_ssh_keys_path(server_ip)
             servers[server_ip] = f"{ssh_settings['user']}@{ssh_settings['key']}"
             ansible_role = 'letsencrypt_standalone'
         else:
-            master_ip = server_sql.get_server_by_id(data.server_id).ip
+            master_ip = server_sql.get_server(data.server_id).ip
             ssh_settings = return_ssh_keys_path(master_ip)
             servers[master_ip] = f"{ssh_settings['user']}@{ssh_settings['key']}"
             ansible_role = 'letsencrypt'
diff --git a/app/views/tools/port_scanner_views.py b/app/views/tools/port_scanner_views.py
index c1b83de4..cfae88d4 100644
--- a/app/views/tools/port_scanner_views.py
+++ b/app/views/tools/port_scanner_views.py
@@ -104,7 +104,7 @@ class PortScannerView(MethodView):
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot find server')
 
         try:
-            server = server_sql.get_server_by_id(server_id)
+            server = server_sql.get_server(server_id)
         except Exception as e:
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot find server')
 
diff --git a/app/views/tools/views.py b/app/views/tools/views.py
index df4f8d9d..61ce7721 100644
--- a/app/views/tools/views.py
+++ b/app/views/tools/views.py
@@ -92,7 +92,7 @@ class CheckerView(MethodView):
             return roxywi_common.handler_exceptions_for_json_data(e, '')
 
         try:
-            server = server_sql.get_server_by_id(server_id)
+            server = server_sql.get_server(server_id)
         except Exception as e:
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot find server')
 
@@ -184,7 +184,7 @@ class CheckerView(MethodView):
             return roxywi_common.handler_exceptions_for_json_data(e, '')
 
         try:
-            server = server_sql.get_server_by_id(server_id)
+            server = server_sql.get_server(server_id)
         except Exception as e:
             return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot find server')
 
diff --git a/app/views/udp/views.py b/app/views/udp/views.py
index f484da5c..a05af2aa 100644
--- a/app/views/udp/views.py
+++ b/app/views/udp/views.py
@@ -115,7 +115,7 @@ class UDPListener(MethodView):
                 if listener.cluster_id:
                     cluster = ha_sql.select_cluster(listener.cluster_id)
                 elif listener.server_id:
-                    server = server_sql.get_server_by_id(listener.server_id)
+                    server = server_sql.get_server(listener.server_id)
                 kwargs = {
                     'clusters': cluster,
                     'listener': listener,