diff --git a/app/emergency/app_config.php b/app/emergency/app_config.php
index 53f7f09e0a..3ede60ab78 100644
--- a/app/emergency/app_config.php
+++ b/app/emergency/app_config.php
@@ -19,78 +19,67 @@
 		$apps[$x]['description']['pt-pt'] = '';
 		$apps[$x]['description']['pt-br'] = '';
 
-        //permission details
-                $y=0;
-                $apps[$x]['permissions'][$y]['name'] = "emergency_logs_view";
-                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-            	$apps[$x]['permissions'][$y]['menu']['uuid'] = "23a6fc8a-77f1-11ee-88b0-005056a27559";
+	//permission details
+		$y=0;
+		$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "23a6fc8a-77f1-11ee-88b0-005056a27559";
 		$y++;
-                $apps[$x]['permissions'][$y]['name'] = "emergency_logs_view_all";
-                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
 	//schema details
 		$z=0;
 		$apps[$x]['db'][$y]['table']['name'] = "v_emergency_logs";
 		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'log_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'emergency_log_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
 		$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
 		$z++;
-                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-                $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-                $z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'date';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'text';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'time';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'text';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'event';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
 		$z++;
-                $apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_date";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
-                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-                $z++;
-                $apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_user";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-                $z++;
-                $apps[$x]['db'][$y]['fields'][$z]['name'] = "update_date";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
-                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-                $z++;
-                $apps[$x]['db'][$y]['fields'][$z]['name'] = "update_user";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-                $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-?>
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_user";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_user";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+
+?>
\ No newline at end of file
diff --git a/app/emergency/app_languages.php b/app/emergency/app_languages.php
index c909a940ce..c681e62eaa 100644
--- a/app/emergency/app_languages.php
+++ b/app/emergency/app_languages.php
@@ -1,133 +1,133 @@
 <?php
 
-$text['title-emergency-logs']['en-us'] = "Emergency Logs";
-$text['title-emergency-logs']['en-gb'] = "Emergency Logs";
-$text['title-emergency-logs']['ar-eg'] = "Emergency Logs";
-$text['title-emergency-logs']['de-at'] = "Notfall-Protokolle";
-$text['title-emergency-logs']['de-ch'] = "Notfall-Protokolle";
-$text['title-emergency-logs']['de-de'] = "Notfall-Protokolle";
-$text['title-emergency-logs']['el-gr'] = "Emergency Logs";
-$text['title-emergency-logs']['es-cl'] = "Emergency Logs";
-$text['title-emergency-logs']['es-mx'] = "Emergency Logs";
-$text['title-emergency-logs']['fr-ca'] = "Emergency Logs";
-$text['title-emergency-logs']['fr-fr'] = "Emergency Logs";
-$text['title-emergency-logs']['he-il'] = "Emergency Logs";
-$text['title-emergency-logs']['it-it'] = "Emergency Logs";
-$text['title-emergency-logs']['nl-nl'] = "Emergency Logs";
-$text['title-emergency-logs']['pl-pl'] = "Emergency Logs";
-$text['title-emergency-logs']['pt-br'] = "Emergency Logs";
-$text['title-emergency-logs']['pt-pt'] = "Emergency Logs";
-$text['title-emergency-logs']['ro-ro'] = "Emergency Logs";
-$text['title-emergency-logs']['ru-ru'] = "Emergency Logs";
-$text['title-emergency-logs']['sv-se'] = "Emergency Logs";
-$text['title-emergency-logs']['uk-ua'] = "Emergency Logs";
-$text['title-emergency-logs']['tr-tr'] = "Emergency Logs";
-$text['title-emergency-logs']['zh-cn'] = "Emergency Logs";
-$text['title-emergency-logs']['ja-jp'] = "Emergency Logs";
-$text['title-emergency-logs']['ko-kr'] = "Emergency Logs";
+$text['title-emergency_logs']['en-us'] = "Emergency Logs";
+$text['title-emergency_logs']['en-gb'] = "Emergency Logs";
+$text['title-emergency_logs']['ar-eg'] = "Emergency Logs";
+$text['title-emergency_logs']['de-at'] = "Notfall-Protokolle";
+$text['title-emergency_logs']['de-ch'] = "Notfall-Protokolle";
+$text['title-emergency_logs']['de-de'] = "Notfall-Protokolle";
+$text['title-emergency_logs']['el-gr'] = "Emergency Logs";
+$text['title-emergency_logs']['es-cl'] = "Emergency Logs";
+$text['title-emergency_logs']['es-mx'] = "Emergency Logs";
+$text['title-emergency_logs']['fr-ca'] = "Emergency Logs";
+$text['title-emergency_logs']['fr-fr'] = "Emergency Logs";
+$text['title-emergency_logs']['he-il'] = "Emergency Logs";
+$text['title-emergency_logs']['it-it'] = "Emergency Logs";
+$text['title-emergency_logs']['nl-nl'] = "Emergency Logs";
+$text['title-emergency_logs']['pl-pl'] = "Emergency Logs";
+$text['title-emergency_logs']['pt-br'] = "Emergency Logs";
+$text['title-emergency_logs']['pt-pt'] = "Emergency Logs";
+$text['title-emergency_logs']['ro-ro'] = "Emergency Logs";
+$text['title-emergency_logs']['ru-ru'] = "Emergency Logs";
+$text['title-emergency_logs']['sv-se'] = "Emergency Logs";
+$text['title-emergency_logs']['uk-ua'] = "Emergency Logs";
+$text['title-emergency_logs']['tr-tr'] = "Emergency Logs";
+$text['title-emergency_logs']['zh-cn'] = "Emergency Logs";
+$text['title-emergency_logs']['ja-jp'] = "Emergency Logs";
+$text['title-emergency_logs']['ko-kr'] = "Emergency Logs";
 
-$text['lable-emergency-time']['en-us'] = "Time";
-$text['lable-emergency-time']['en-gb'] = "Time";
-$text['lable-emergency-time']['ar-eg'] = "Time";
-$text['lable-emergency-time']['de-at'] = "Zeitpunkt";
-$text['lable-emergency-time']['de-ch'] = "Zeitpunkt";
-$text['lable-emergency-time']['de-de'] = "Zeitpunkt";
-$text['lable-emergency-time']['el-gr'] = "Time";
-$text['lable-emergency-time']['es-cl'] = "Time";
-$text['lable-emergency-time']['es-mx'] = "Time";
-$text['lable-emergency-time']['fr-ca'] = "Time";
-$text['lable-emergency-time']['fr-fr'] = "Time";
-$text['lable-emergency-time']['he-il'] = "Time";
-$text['lable-emergency-time']['it-it'] = "Time";
-$text['lable-emergency-time']['nl-nl'] = "Time";
-$text['lable-emergency-time']['pl-pl'] = "Time";
-$text['lable-emergency-time']['pt-br'] = "Time";
-$text['lable-emergency-time']['pt-pt'] = "Time";
-$text['lable-emergency-time']['ro-ro'] = "Time";
-$text['lable-emergency-time']['ru-ru'] = "Time";
-$text['lable-emergency-time']['sv-se'] = "Time";
-$text['lable-emergency-time']['uk-ua'] = "Time";
-$text['lable-emergency-time']['tr-tr'] = "Time";
-$text['lable-emergency-time']['zh-cn'] = "Time";
-$text['lable-emergency-time']['ja-jp'] = "Time";
-$text['lable-emergency-time']['ko-kr'] = "Time";
+$text['lable-emergency_time']['en-us'] = "Time";
+$text['lable-emergency_time']['en-gb'] = "Time";
+$text['lable-emergency_time']['ar-eg'] = "Time";
+$text['lable-emergency_time']['de-at'] = "Zeitpunkt";
+$text['lable-emergency_time']['de-ch'] = "Zeitpunkt";
+$text['lable-emergency_time']['de-de'] = "Zeitpunkt";
+$text['lable-emergency_time']['el-gr'] = "Time";
+$text['lable-emergency_time']['es-cl'] = "Time";
+$text['lable-emergency_time']['es-mx'] = "Time";
+$text['lable-emergency_time']['fr-ca'] = "Time";
+$text['lable-emergency_time']['fr-fr'] = "Time";
+$text['lable-emergency_time']['he-il'] = "Time";
+$text['lable-emergency_time']['it-it'] = "Time";
+$text['lable-emergency_time']['nl-nl'] = "Time";
+$text['lable-emergency_time']['pl-pl'] = "Time";
+$text['lable-emergency_time']['pt-br'] = "Time";
+$text['lable-emergency_time']['pt-pt'] = "Time";
+$text['lable-emergency_time']['ro-ro'] = "Time";
+$text['lable-emergency_time']['ru-ru'] = "Time";
+$text['lable-emergency_time']['sv-se'] = "Time";
+$text['lable-emergency_time']['uk-ua'] = "Time";
+$text['lable-emergency_time']['tr-tr'] = "Time";
+$text['lable-emergency_time']['zh-cn'] = "Time";
+$text['lable-emergency_time']['ja-jp'] = "Time";
+$text['lable-emergency_time']['ko-kr'] = "Time";
 
-$text['lable-emergency-date']['en-us'] = "Date";
-$text['lable-emergency-date']['en-gb'] = "Date";
-$text['lable-emergency-date']['ar-eg'] = "Date";
-$text['lable-emergency-date']['de-at'] = "Datum";
-$text['lable-emergency-date']['de-ch'] = "Datum";
-$text['lable-emergency-date']['de-de'] = "Datum";
-$text['lable-emergency-date']['el-gr'] = "Date";
-$text['lable-emergency-date']['es-cl'] = "Date";
-$text['lable-emergency-date']['es-mx'] = "Date";
-$text['lable-emergency-date']['fr-ca'] = "Date";
-$text['lable-emergency-date']['fr-fr'] = "Date";
-$text['lable-emergency-date']['he-il'] = "Date";
-$text['lable-emergency-date']['it-it'] = "Date";
-$text['lable-emergency-date']['nl-nl'] = "Date";
-$text['lable-emergency-date']['pl-pl'] = "Date";
-$text['lable-emergency-date']['pt-br'] = "Date";
-$text['lable-emergency-date']['pt-pt'] = "Date";
-$text['lable-emergency-date']['ro-ro'] = "Date";
-$text['lable-emergency-date']['ru-ru'] = "Date";
-$text['lable-emergency-date']['sv-se'] = "Date";
-$text['lable-emergency-date']['uk-ua'] = "Date";
-$text['lable-emergency-date']['tr-tr'] = "Date";
-$text['lable-emergency-date']['zh-cn'] = "Date";
-$text['lable-emergency-date']['ja-jp'] = "Date";
-$text['lable-emergency-date']['ko-kr'] = "Date";
+$text['lable-emergency_date']['en-us'] = "Date";
+$text['lable-emergency_date']['en-gb'] = "Date";
+$text['lable-emergency_date']['ar-eg'] = "Date";
+$text['lable-emergency_date']['de-at'] = "Datum";
+$text['lable-emergency_date']['de-ch'] = "Datum";
+$text['lable-emergency_date']['de-de'] = "Datum";
+$text['lable-emergency_date']['el-gr'] = "Date";
+$text['lable-emergency_date']['es-cl'] = "Date";
+$text['lable-emergency_date']['es-mx'] = "Date";
+$text['lable-emergency_date']['fr-ca'] = "Date";
+$text['lable-emergency_date']['fr-fr'] = "Date";
+$text['lable-emergency_date']['he-il'] = "Date";
+$text['lable-emergency_date']['it-it'] = "Date";
+$text['lable-emergency_date']['nl-nl'] = "Date";
+$text['lable-emergency_date']['pl-pl'] = "Date";
+$text['lable-emergency_date']['pt-br'] = "Date";
+$text['lable-emergency_date']['pt-pt'] = "Date";
+$text['lable-emergency_date']['ro-ro'] = "Date";
+$text['lable-emergency_date']['ru-ru'] = "Date";
+$text['lable-emergency_date']['sv-se'] = "Date";
+$text['lable-emergency_date']['uk-ua'] = "Date";
+$text['lable-emergency_date']['tr-tr'] = "Date";
+$text['lable-emergency_date']['zh-cn'] = "Date";
+$text['lable-emergency_date']['ja-jp'] = "Date";
+$text['lable-emergency_date']['ko-kr'] = "Date";
 
-$text['lable-emergency-extension']['en-us'] = "Extension";
-$text['lable-emergency-extension']['en-gb'] = "Extension";
-$text['lable-emergency-extension']['ar-eg'] = "Extension";
-$text['lable-emergency-extension']['de-at'] = "Nebenstelle";
-$text['lable-emergency-extension']['de-ch'] = "Nebenstelle";
-$text['lable-emergency-extension']['de-de'] = "Nebenstelle";
-$text['lable-emergency-extension']['el-gr'] = "Extension";
-$text['lable-emergency-extension']['es-cl'] = "Extension";
-$text['lable-emergency-extension']['es-mx'] = "Extension";
-$text['lable-emergency-extension']['fr-ca'] = "Extension";
-$text['lable-emergency-extension']['fr-fr'] = "Extension";
-$text['lable-emergency-extension']['he-il'] = "Extension";
-$text['lable-emergency-extension']['it-it'] = "Extension";
-$text['lable-emergency-extension']['nl-nl'] = "Extension";
-$text['lable-emergency-extension']['pl-pl'] = "Extension";
-$text['lable-emergency-extension']['pt-br'] = "Extension";
-$text['lable-emergency-extension']['pt-pt'] = "Extension";
-$text['lable-emergency-extension']['ro-ro'] = "Extension";
-$text['lable-emergency-extension']['ru-ru'] = "Extension";
-$text['lable-emergency-extension']['sv-se'] = "Extension";
-$text['lable-emergency-extension']['uk-ua'] = "Extension";
-$text['lable-emergency-extension']['tr-tr'] = "Extension";
-$text['lable-emergency-extension']['zh-cn'] = "Extension";
-$text['lable-emergency-extension']['ja-jp'] = "Extension";
-$text['lable-emergency-extension']['ko-kr'] = "Extension";
+$text['lable-emergency_extension']['en-us'] = "Extension";
+$text['lable-emergency_extension']['en-gb'] = "Extension";
+$text['lable-emergency_extension']['ar-eg'] = "Extension";
+$text['lable-emergency_extension']['de-at'] = "Nebenstelle";
+$text['lable-emergency_extension']['de-ch'] = "Nebenstelle";
+$text['lable-emergency_extension']['de-de'] = "Nebenstelle";
+$text['lable-emergency_extension']['el-gr'] = "Extension";
+$text['lable-emergency_extension']['es-cl'] = "Extension";
+$text['lable-emergency_extension']['es-mx'] = "Extension";
+$text['lable-emergency_extension']['fr-ca'] = "Extension";
+$text['lable-emergency_extension']['fr-fr'] = "Extension";
+$text['lable-emergency_extension']['he-il'] = "Extension";
+$text['lable-emergency_extension']['it-it'] = "Extension";
+$text['lable-emergency_extension']['nl-nl'] = "Extension";
+$text['lable-emergency_extension']['pl-pl'] = "Extension";
+$text['lable-emergency_extension']['pt-br'] = "Extension";
+$text['lable-emergency_extension']['pt-pt'] = "Extension";
+$text['lable-emergency_extension']['ro-ro'] = "Extension";
+$text['lable-emergency_extension']['ru-ru'] = "Extension";
+$text['lable-emergency_extension']['sv-se'] = "Extension";
+$text['lable-emergency_extension']['uk-ua'] = "Extension";
+$text['lable-emergency_extension']['tr-tr'] = "Extension";
+$text['lable-emergency_extension']['zh-cn'] = "Extension";
+$text['lable-emergency_extension']['ja-jp'] = "Extension";
+$text['lable-emergency_extension']['ko-kr'] = "Extension";
 
-$text['lable-emergency-event']['en-us'] = "Event";
-$text['lable-emergency-event']['en-gb'] = "Event";
-$text['lable-emergency-event']['ar-eg'] = "Event";
-$text['lable-emergency-event']['de-at'] = "Event";
-$text['lable-emergency-event']['de-ch'] = "Event";
-$text['lable-emergency-event']['de-de'] = "Event";
-$text['lable-emergency-event']['el-gr'] = "Event";
-$text['lable-emergency-event']['es-cl'] = "Event";
-$text['lable-emergency-event']['es-mx'] = "Event";
-$text['lable-emergency-event']['fr-ca'] = "Event";
-$text['lable-emergency-event']['fr-fr'] = "Event";
-$text['lable-emergency-event']['he-il'] = "Event";
-$text['lable-emergency-event']['it-it'] = "Event";
-$text['lable-emergency-event']['nl-nl'] = "Event";
-$text['lable-emergency-event']['pl-pl'] = "Event";
-$text['lable-emergency-event']['pt-br'] = "Event";
-$text['lable-emergency-event']['pt-pt'] = "Event";
-$text['lable-emergency-event']['ro-ro'] = "Event";
-$text['lable-emergency-event']['ru-ru'] = "Event";
-$text['lable-emergency-event']['sv-se'] = "Event";
-$text['lable-emergency-event']['uk-ua'] = "Event";
-$text['lable-emergency-event']['tr-tr'] = "Event";
-$text['lable-emergency-event']['zh-cn'] = "Event";
-$text['lable-emergency-event']['ja-jp'] = "Event";
-$text['lable-emergency-event']['ko-kr'] = "Event";
+$text['lable-emergency_event']['en-us'] = "Event";
+$text['lable-emergency_event']['en-gb'] = "Event";
+$text['lable-emergency_event']['ar-eg'] = "Event";
+$text['lable-emergency_event']['de-at'] = "Event";
+$text['lable-emergency_event']['de-ch'] = "Event";
+$text['lable-emergency_event']['de-de'] = "Event";
+$text['lable-emergency_event']['el-gr'] = "Event";
+$text['lable-emergency_event']['es-cl'] = "Event";
+$text['lable-emergency_event']['es-mx'] = "Event";
+$text['lable-emergency_event']['fr-ca'] = "Event";
+$text['lable-emergency_event']['fr-fr'] = "Event";
+$text['lable-emergency_event']['he-il'] = "Event";
+$text['lable-emergency_event']['it-it'] = "Event";
+$text['lable-emergency_event']['nl-nl'] = "Event";
+$text['lable-emergency_event']['pl-pl'] = "Event";
+$text['lable-emergency_event']['pt-br'] = "Event";
+$text['lable-emergency_event']['pt-pt'] = "Event";
+$text['lable-emergency_event']['ro-ro'] = "Event";
+$text['lable-emergency_event']['ru-ru'] = "Event";
+$text['lable-emergency_event']['sv-se'] = "Event";
+$text['lable-emergency_event']['uk-ua'] = "Event";
+$text['lable-emergency_event']['tr-tr'] = "Event";
+$text['lable-emergency_event']['zh-cn'] = "Event";
+$text['lable-emergency_event']['ja-jp'] = "Event";
+$text['lable-emergency_event']['ko-kr'] = "Event";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/emergency/emergency.php b/app/emergency/emergency.php
index 3564d30f98..19f4da253c 100644
--- a/app/emergency/emergency.php
+++ b/app/emergency/emergency.php
@@ -78,9 +78,8 @@ if (!empty($_GET["show"])) {
 	$show = $_GET["show"];
 }
 
-
 //get the count
-$sql = "select count(log_uuid) ";
+$sql = "select count(emergency_log_uuid) ";
 $sql .= "from v_emergency_logs ";
 if ($show == 'all') {
 	$sql .= "where true ";
@@ -117,7 +116,13 @@ else {
 }
 
 //get the list
-$sql = "select * ";
+$sql = "select emergency_log_uuid, ";
+$sql .= "domain_uuid, ";
+$sql .= "extension, ";
+$sql .= "event,  ";
+$sql .= "to_char(timezone(:time_zone, insert_date), 'DD Mon YYYY') as date_formatted, ";
+$sql .= "to_char(timezone(:time_zone, insert_date), 'HH12:MI:SS am') as time_formatted, ";
+$sql .= "insert_date ";
 $sql .= "from v_emergency_logs ";
 if ($show == 'all') {
 	$sql .= "where true ";
@@ -133,7 +138,7 @@ if (!empty($search)) {
 	$parameters['search'] = '%'.$search.'%';
 }
 $sql .= limit_offset($rows_per_page, $offset);
-
+$parameters['time_zone'] = $time_zone;
 $database = new database;
 $emergency_logs = $database->select($sql, $parameters ?? null, 'all');
 unset($sql, $parameters);
@@ -143,12 +148,12 @@ $object = new token;
 $token = $object->create($_SERVER['PHP_SELF']);
 
 //additional includes
-$document['title'] = $text['title-emergency-logs'];
+$document['title'] = $text['title-emergency_logs'];
 require_once "resources/header.php";
 
 //show the content
 echo "<div class='action_bar' id='action_bar'>\n";
-echo "	<div class='heading'><b>".$text['title-emergency-logs']." (".$num_rows.")</b></div>\n";
+echo "	<div class='heading'><b>".$text['title-emergency_logs']." (".$num_rows.")</b></div>\n";
 echo "	<div class='actions'>\n";
 if ($emergency_logs) {
 	echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
@@ -181,18 +186,18 @@ echo "<br /><br />\n";
 
 echo "<table class='list'>\n";
 echo "<tr class='list-header'>\n";
-echo "<th class='left'>".$text['lable-emergency-time']."</th>\n";
-echo "<th class='left'>".$text['lable-emergency-date']."</th>\n";
-echo "<th class='left'>".$text['lable-emergency-extension']."</th>\n";
-echo "<th class='left'>".$text['lable-emergency-event']."</th>\n";
+echo "<th class='left'>".$text['lable-emergency_time']."</th>\n";
+echo "<th class='left'>".$text['lable-emergency_date']."</th>\n";
+echo "<th class='left'>".$text['lable-emergency_extension']."</th>\n";
+echo "<th class='left'>".$text['lable-emergency_event']."</th>\n";
 echo "</tr>\n";
 
 if (!empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_logs) != 0) {
 	$x = 0;
 	foreach ($emergency_logs as $row) {
 		echo "<tr class='list-row'>\n";
-		echo "	<td>".escape($row['time'])."</td>\n";
-		echo "	<td>".escape($row['date'])."</td>\n";
+		echo "	<td>".escape($row['time_formatted'])."</td>\n";
+		echo "	<td>".escape($row['date_formatted'])."</td>\n";
 		echo "	<td>".escape($row['extension'])."</td>\n";
 		echo "	<td>".escape($row['event'])."</td>\n";
 		echo "</tr>\n";
@@ -210,4 +215,4 @@ echo "</form>\n";
 //include the footer
 require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file