Update geocode command for latest models; drop the natural key stuff that was broken anyway