bugfix: categories filter wasn't working as expected after the previous fix attempt.
minor changes: refactoring and minor enhancements on loading maps app view.
Merge branch 'develop'
build 33