diff --git a/conf/autoload_configs/cidlookup.conf.xml b/conf/autoload_configs/cidlookup.conf.xml
index eb8fdc24f9..c032e8acc7 100644
--- a/conf/autoload_configs/cidlookup.conf.xml
+++ b/conf/autoload_configs/cidlookup.conf.xml
@@ -6,10 +6,16 @@
 
     <param name="odbc-dsn" value="phone:phone:phone"/>
     <param name="sql" value="
-SELECT name||' ('||type||')' AS name 
-  FROM phonebook p JOIN numbers n ON p.id = n.phonebook_id
-  WHERE n.number='${caller_id_number}' 
-  LIMIT 1
-    "/>
+     SELECT name||' ('||type||')' AS name 
+      FROM phonebook p JOIN numbers n ON p.id = n.phonebook_id
+      WHERE n.number='${caller_id_number}' 
+      LIMIT 1
+      "/>
+    <param name="citystate-sql" value="
+     SELECT ratecenter||' '||state as name
+      FROM npa_nxx_company_ocn
+      WHERE npa = ${caller_id_number:1:3} AND nxx = ${caller_id_number:4:3}
+      LIMIT 1
+      "/>
   </settings>
 </configuration>