Index: applications/editors/josm/haiti_earthquake/hospitals/HospitalChunkCheck.groovy
===================================================================
--- applications/editors/josm/haiti_earthquake/hospitals/HospitalChunkCheck.groovy	(revision 19878)
+++ applications/editors/josm/haiti_earthquake/hospitals/HospitalChunkCheck.groovy	(revision 19879)
@@ -39,10 +39,10 @@
 		return "bbox=${minLon},${minLat},${maxLon},${maxLat}"		
 	}
-		
+	
 	def int countHospitalsInProximity(node) {
 		def bbox = buildQueryBbox(node)
 		def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[amenity=hospital][${bbox}]"
 		def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-		def int  count = xpath.evaluate("count(//node/tag[@k = 'amenity'][@v = 'hospital'])", xapiResponse, XPathConstants.NUMBER)
+		def int  count = xpath.evaluate("count(//tag[@k = 'amenity'][@v = 'hospital']/..)", xapiResponse, XPathConstants.NUMBER)
 		return count
 	}
@@ -52,5 +52,5 @@
 		def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[health_facility:paho_id=*][${bbox}]"
 		def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-		def int count = xpath.evaluate("count(//node/tag[@k = 'health_facility:paho_id'])", xapiResponse, XPathConstants.NUMBER)
+		def int count = xpath.evaluate("count(//tag[@k = 'health_facility:paho_id']/..)", xapiResponse, XPathConstants.NUMBER)
 		return count
 	}
@@ -60,5 +60,5 @@
 		def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[health_facility:paho_id=${id}]"
 		def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-		def int count = xpath.evaluate("count(//node/tag[@k = 'health_facility:paho_id'])", xapiResponse, XPathConstants.NUMBER)
+		def int count = xpath.evaluate("count(//tag[@k = 'health_facility:paho_id'][@v ='${id}'])", xapiResponse, XPathConstants.NUMBER)
 		return count > 0
 	}