diff --git a/app/call_centers/app_config.php b/app/call_centers/app_config.php
index b58a5a5cef..a8814098b3 100644
--- a/app/call_centers/app_config.php
+++ b/app/call_centers/app_config.php
@@ -25,7 +25,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "call_centers";
 		$apps[$x]['destinations'][$y]['name'] = "call_centers";
 		$apps[$x]['destinations'][$y]['sql'] = "select queue_extension as destination, queue_description as  description from v_call_center_queues";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "queue_name asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "queue_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "queue_extension";
diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php
index d7011ec6e3..aeaa615769 100644
--- a/app/call_flows/app_config.php
+++ b/app/call_flows/app_config.php
@@ -24,7 +24,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_flows";
 		$apps[$x]['destinations'][$y]['name'] = "call_flows";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "call_flow_name asc";
 		$apps[$x]['destinations'][$y]['field']['context'] = "call_flow_context";
 		$apps[$x]['destinations'][$y]['field']['name'] = "call_flow_name";
diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php
index 1664a23b16..04e0459159 100644
--- a/app/conferences/app_config.php
+++ b/app/conferences/app_config.php
@@ -24,7 +24,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "conferences";
 		$apps[$x]['destinations'][$y]['name'] = "conferences";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and conference_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and conference_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "conference_name asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "conference_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "conference_extension";
diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index 7a49bd23d1..cd3857acb4 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "destinations";
 		$apps[$x]['destinations'][$y]['name'] = "destinations";
 		$apps[$x]['destinations'][$y]['sql'] = "select destination_number as destination, destination_description as description from v_destinations ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and destination_type = 'outbound' destination_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and destination_type = 'outbound' destination_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "destination_number asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "destination_uuid";
 		$apps[$x]['destinations'][$y]['field']['context'] = "destination_context";
diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index c35d77f4d3..8301e94550 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -25,7 +25,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "extensions";
 		$apps[$x]['destinations'][$y]['name'] = "extensions";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "extension asc";
 		$apps[$x]['destinations'][$y]['field']['context'] = "user_context";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "extension";
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index b058e2da63..b0e94962d6 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -25,7 +25,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "fax";
 		$apps[$x]['destinations'][$y]['name'] = "fax";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "fax_extension asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "fax_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "fax_extension";
diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php
index aaeb5aa0a8..26fa5a8560 100644
--- a/app/gateways/app_config.php
+++ b/app/gateways/app_config.php
@@ -27,7 +27,7 @@
 		$apps[$x]['destinations'][$y]['name'] = "gateways";
 		$apps[$x]['destinations'][$y]['sql'] = "select g.gateway_uuid as uuid, g.gateway as name, d.domain_name from v_gateways as g ";
 		$apps[$x]['destinations'][$y]['sql'] .= "inner join v_domains as d on g.domain_uuid = d.domain_uuid ";
-		$apps[$x]['destinations'][$y]['where'] = "where g.domain_uuid = '${domain_uuid}' and g.enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where g.domain_uuid = '\${domain_uuid}' and g.enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "gateway asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "gateway_uuid";
 		$apps[$x]['destinations'][$y]['field']['name'] = "gateway";
diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php
index b8b1320e22..911b6ef3d0 100644
--- a/app/ivr_menus/app_config.php
+++ b/app/ivr_menus/app_config.php
@@ -25,7 +25,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "ivr_menus";
 		$apps[$x]['destinations'][$y]['name'] = "ivr_menus";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and ivr_menu_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and ivr_menu_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "ivr_menu_extension asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "ivr_menu_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "ivr_menu_extension";
diff --git a/app/phrases/app_config.php b/app/phrases/app_config.php
index c219d71046..58423e6a79 100644
--- a/app/phrases/app_config.php
+++ b/app/phrases/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "phrases";
 		$apps[$x]['destinations'][$y]['name'] = "phrases";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and phrase_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and phrase_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "phrase_name asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "phrase_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "phrase_name";
diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php
index c14847813f..b660cb2765 100644
--- a/app/recordings/app_config.php
+++ b/app/recordings/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "recordings";
 		$apps[$x]['destinations'][$y]['name'] = "recordings";
 		$apps[$x]['destinations'][$y]['sql'] = "select recording_uuid as uuid, recording_name as name, recording_filename as destination, recording_description as description from v_recordings";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "recording_name asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "recording_uuid";
 		$apps[$x]['destinations'][$y]['field']['name'] = "recording_name";
diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php
index f50953f462..2a3266b1a4 100644
--- a/app/ring_groups/app_config.php
+++ b/app/ring_groups/app_config.php
@@ -25,7 +25,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "ring_groups";
 		$apps[$x]['destinations'][$y]['name'] = "ring_groups";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and ring_group_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and ring_group_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "ring_group_extension asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "ring_group_name";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "ring_group_extension";
diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php
index 8ddeb60615..1c0a8bc31e 100644
--- a/app/time_conditions/app_config.php
+++ b/app/time_conditions/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "time_conditions";
 		$apps[$x]['destinations'][$y]['name'] = "time_conditions";
 		$apps[$x]['destinations'][$y]['sql'] = "select dialplan_name as name, dialplan_number as destination, dialplan_description as description from v_dialplans ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' and dialplan_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' and dialplan_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "dialplan_number asc";
 		$apps[$x]['destinations'][$y]['field']['context'] = "dialplan_context";
 		$apps[$x]['destinations'][$y]['field']['name'] = "dialplan_name";
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index ed3fd742c2..d894dcbdfb 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -16,7 +16,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "voicemails";
 		$apps[$x]['destinations'][$y]['name'] = "voicemails";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '${domain_uuid}' and voicemail_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and voicemail_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "voicemail_id asc ";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "voicemail_id";
 		$apps[$x]['destinations'][$y]['field']['description'] = "voicemail_description";