--- a/directmapping-webapp/src/main/resources/queries/emp_addr2FOAF.construct	Thu May 05 19:43:02 2011 -0400
+++ b/directmapping-webapp/src/main/resources/queries/emp_addr2FOAF.construct	Thu May 05 19:57:36 2011 -0400
@@ -3,6 +3,6 @@
 
 CONSTRUCT { ?who foaf:given ?fname } WHERE { ?who <People#fname> ?fname }
 
-CONSTRUCT { ?addr vcard:streetNumber ?no ; vcard:streetName ?name } WHERE { ?addr <Addresses#streetNo> ?no ; <Addresses#streetName> ?name }
+CONSTRUCT { ?addr vcard:region ?state ; vcard:locality ?city } WHERE { ?addr <Addresses#city> ?city ; <Addresses#state> ?state }
 
-CONSTRUCT { ?who vcard:homeAddr ?addr } WHERE { ?who <People#addr> ?addr }
\ No newline at end of file
+CONSTRUCT { ?who vcard:homeAddr ?addr } WHERE { ?who <People#addr> ?addr }