Refactor and fixes prior to map search
For the sake of making the revision simpler, I have cherry-picked commits that were made while working on the map search and are required by it, but are not directly related.
Part of #24 (closed)
For the sake of making the revision simpler, I have cherry-picked commits that were made while working on the map search and are required by it, but are not directly related.
Part of #24 (closed)