Bugfixes for geocoder