Improve handling of placenames vs. address data