Cleanup: fixes to support toponyms without text/character offset