More work on search/geocode interface