diff --git a/app/call_block/resources/database/views/call_block.php b/app/call_block/resources/database/views/call_block.php
index 93e64edc2a..be092066dd 100644
--- a/app/call_block/resources/database/views/call_block.php
+++ b/app/call_block/resources/database/views/call_block.php
@@ -1,12 +1,30 @@
 <?php
 
-	$view['name'] = "view_call_block";
-	$view['version'] = "20250919";
-	$view['description'] = "Show the call block details with extension information.";
-	$view['sql'] = "	select domain_uuid, group_uuid, group_name, ";
-    $view['sql'] .= "	select c.domain_uuid, call_block_uuid, c.call_block_direction, c.extension_uuid, c.call_block_name, c.call_block_country_code, \n";
-	$view['sql'] .= "	c.call_block_number, e.extension, e.number_alias, c.call_block_count, c.call_block_app, c.call_block_data, c.date_added, \n";
-	$view['sql'] .= "	c.call_block_enabled, c.call_block_description, c.insert_date, c.insert_user, c.update_date, c.update_user \n";
-	$view['sql'] .= "	from v_call_block as c \n";
-	$view['sql'] .= " left join v_extensions as e \n";
-	$view['sql'] .= "	on c.extension_uuid = e.extension_uuid \n";
+$view['name'] = "view_call_block";
+$view['version'] = "20251207";
+$view['description'] = "Show the call block details with extension information.";
+
+$view['sql']  = "SELECT \n";
+$view['sql'] .= "    c.domain_uuid, \n";
+$view['sql'] .= "    c.call_block_uuid, \n";
+$view['sql'] .= "    c.call_block_direction, \n";
+$view['sql'] .= "    c.extension_uuid, \n";
+$view['sql'] .= "    c.call_block_name, \n";
+$view['sql'] .= "    c.call_block_country_code, \n";
+$view['sql'] .= "    c.call_block_number, \n";
+$view['sql'] .= "    e.extension, \n";
+$view['sql'] .= "    e.number_alias, \n";
+$view['sql'] .= "    c.call_block_count, \n";
+$view['sql'] .= "    c.call_block_app, \n";
+$view['sql'] .= "    c.call_block_data, \n";
+$view['sql'] .= "    c.date_added, \n";
+$view['sql'] .= "    c.call_block_enabled, \n";
+$view['sql'] .= "    c.call_block_description, \n";
+$view['sql'] .= "    c.insert_date, \n";
+$view['sql'] .= "    c.insert_user, \n";
+$view['sql'] .= "    c.update_date, \n";
+$view['sql'] .= "    c.update_user \n";
+$view['sql'] .= "FROM v_call_block AS c \n";
+$view['sql'] .= "LEFT JOIN v_extensions AS e \n";
+$view['sql'] .= "    ON c.extension_uuid = e.extension_uuid;\n";
+
diff --git a/app/extensions/resources/database/views/extensions.php b/app/extensions/resources/database/views/extensions.php
index 9e1d3a54ea..c5b4caaa0a 100644
--- a/app/extensions/resources/database/views/extensions.php
+++ b/app/extensions/resources/database/views/extensions.php
@@ -1,15 +1,14 @@
 <?php
 
 $view['name'] = "view_extensions";
-$view['version'] = "20250920";
+$view['version'] = "20251207";
 $view['description'] = "Show the extensions with assigned users";
-$view['sql'] = "SELECT \n";
-$view['sql'] .= "e.*, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(u.*) \n";
-$view['sql'] .= "	FROM v_extension_users as u \n";
-$view['sql'] .= "	WHERE u.extension_uuid = e.extension_uuid \n";
-$view['sql'] .= ") AS extension_users \n";
-$view['sql'] .= "FROM \n";
-$view['sql'] .= "	v_extensions as e \n";
-$view['sql'] .= "); \n";
+
+$view['sql']  = "SELECT \n";
+$view['sql'] .= "    e.*, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(u.*) \n";
+$view['sql'] .= "        FROM v_extension_users AS u \n";
+$view['sql'] .= "        WHERE u.extension_uuid = e.extension_uuid \n";
+$view['sql'] .= "    ) AS extension_users \n";
+$view['sql'] .= "FROM v_extensions AS e;\n";
diff --git a/core/contacts/resources/database/views/contacts.php b/core/contacts/resources/database/views/contacts.php
index c2b8b9d2ff..fbdbf0c53c 100644
--- a/core/contacts/resources/database/views/contacts.php
+++ b/core/contacts/resources/database/views/contacts.php
@@ -3,48 +3,47 @@
 $view['name'] = "view_contacts";
 $view['version'] = "20250920";
 $view['description'] = "Show the contacts with assigned addresses, phones, emails, urls, users, groups, settings, and relations";
-$view['sql'] = "SELECT \n";
-$view['sql'] .= "c.*, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(a.*) \n";
-$view['sql'] .= "	FROM v_contact_addresses as a \n";
-$view['sql'] .= "	WHERE a.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_addresses, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(p.*) \n";
-$view['sql'] .= "	FROM v_contact_phones as p \n";
-$view['sql'] .= "	WHERE p.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_phones, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(e.*) \n";
-$view['sql'] .= "	FROM v_contact_emails as e \n";
-$view['sql'] .= "	WHERE e.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_emails, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(l.*) \n";
-$view['sql'] .= "	FROM v_contact_urls as l \n";
-$view['sql'] .= "	WHERE l.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_urls, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(u.*) \n";
-$view['sql'] .= "	FROM v_contact_users as u \n";
-$view['sql'] .= "	WHERE u.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_users, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(g.*) \n";
-$view['sql'] .= "	FROM v_contact_groups as g \n";
-$view['sql'] .= "	WHERE g.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_groups, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(s.*) \n";
-$view['sql'] .= "	FROM v_contact_settings as s \n";
-$view['sql'] .= "	WHERE s.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_settings, \n";
-$view['sql'] .= "( \n";
-$view['sql'] .= "	SELECT json_agg(r.*) \n";
-$view['sql'] .= "	FROM v_contact_relations as r \n";
-$view['sql'] .= "	WHERE r.contact_uuid = c.contact_uuid \n";
-$view['sql'] .= ") AS contact_relations \n";
-$view['sql'] .= "FROM \n";
-$view['sql'] .= "v_contacts as c \n";
-$view['sql'] .= "); \n";
+
+$view['sql']  = "SELECT \n";
+$view['sql'] .= "    c.*, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(a.*) \n";
+$view['sql'] .= "        FROM v_contact_addresses AS a \n";
+$view['sql'] .= "        WHERE a.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_addresses, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(p.*) \n";
+$view['sql'] .= "        FROM v_contact_phones AS p \n";
+$view['sql'] .= "        WHERE p.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_phones, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(e.*) \n";
+$view['sql'] .= "        FROM v_contact_emails AS e \n";
+$view['sql'] .= "        WHERE e.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_emails, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(l.*) \n";
+$view['sql'] .= "        FROM v_contact_urls AS l \n";
+$view['sql'] .= "        WHERE l.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_urls, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(u.*) \n";
+$view['sql'] .= "        FROM v_contact_users AS u \n";
+$view['sql'] .= "        WHERE u.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_users, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(g.*) \n";
+$view['sql'] .= "        FROM v_contact_groups AS g \n";
+$view['sql'] .= "        WHERE g.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_groups, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(s.*) \n";
+$view['sql'] .= "        FROM v_contact_settings AS s \n";
+$view['sql'] .= "        WHERE s.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_settings, \n";
+$view['sql'] .= "    ( \n";
+$view['sql'] .= "        SELECT json_agg(r.*) \n";
+$view['sql'] .= "        FROM v_contact_relations AS r \n";
+$view['sql'] .= "        WHERE r.contact_uuid = c.contact_uuid \n";
+$view['sql'] .= "    ) AS contact_relations \n";
+$view['sql'] .= "FROM v_contacts AS c;\n";