improve map markers, improve filter
Merge branch 'master' into gh-pages