Handful of edits re geonames_id, custom fields