Adresses #1471 - Introduced SearchableMarkerCollection, reduced code accordingly.
Adresses #1471 - Removed drawTerminals(), drawMensen() and drawInstitutes(), replaced them with drawCategory().
Closes #1471 - Refactored and reduced code.