more bug fixes from having the geographic wildcard and db fixups