reworked map markers behavior