improve map markers, improve filter