fix _map partial for @marker
Merge branch 'dev'