Fix markers issues
Merge branch 'SearchBox'
Merge branch 'master' into prod