Removed redundant calculation of basename, minor tweaks to adhioc
gazetteer data