MAP-762: more improvements, needs testing
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop
MAP-873: better indexing