From 2ce8693abe1bc6b24bc628396fbfd7ee70a60187 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Jan 2020 14:32:37 -0700
Subject: [PATCH] Update 870_cidlookup.xml

---
 .../resources/switch/conf/dialplan/870_cidlookup.xml         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
index d6daa62dfa..31aa37db2a 100644
--- a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
@@ -1,9 +1,10 @@
 <context name="{v_context}">
 	<extension name="cidlookup" number="" continue="true" app_uuid="a0cb498c-6e09-441f-83ea-a7684565c44e" enabled="false" order="870">
 		<condition field="${user_exists}" expression="^true$"/>
-		<condition field="${call_direction}" expression="^inbound$">
+		<condition field="${call_direction}" expression="^inbound$"/>
 		<condition field="${module_exists(mod_cidlookup)}" expression="^true$"/>
-			<action application="set" data="effective_caller_id_name=${cidlookup(${caller_id_number})}"/>
+		<condition field="caller_id_number" expression="^\+?1?(\d{10})$">
+			<action application="set" data="effective_caller_id_name=${cidlookup($1)}"/>
 		</condition>
 	</extension>
 </context>