Fix geocoder problem with double quotes and merged updates