Fix markers issues
Merge branch 'SearchBox'