Geocoder fixes for when we don't have data loaded, MCOP tweaks