--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/30 13:47:21	2787
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/12/01 11:08:56	2788
@@ -265,7 +265,7 @@
 		}
 		
 		if (gadeident == null) {
-			String vej = levenshteinHelper.proposeStreetName(request, result);
+			String vej = metaphoneHelper.proposeStreetName(request, result);
 			if (vej != null) {
 				gadeident =  request.streetNames.get(vej);
 			}
@@ -321,14 +321,19 @@
 		Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
 		DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>();
 		
+		DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
+		DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
+		
 		for (Address a : alleAdresser) {
 			idAddressMap.put(a.id, a);
 			
-			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr);		
+			Short postnr = shortHelper.getInstance(a.postnr);
+			
+			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);		
 			
 			if (postnrVeje == null) {
 				postnrVeje = new ConcurrentHashMap<String,Integer>();
-				searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje);
+				searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
 			}
 				
 			
@@ -337,7 +342,7 @@
 			if (gadeident == null) {				
 				//postnrVeje.put(vasketVejnavn, a.gadeid);
 				
-				gadeident = a.gadeid;
+				gadeident = intHelper.getInstance( a.gadeid );
 				
 				Set<String> aliaser = findVejAliaser(a.vejnavn);
 				for(String alias : aliaser) {