More cleanup of locations
Fix problems with geocoder, clean data further