Fix Geocoder and HomeButton after last change.