Revert "[BUGFIX] map crashed when search result empty"
[BUGFIX] map crashed when search result empty
Merge branch 'develop' into revert-153-ADWD-1367
Merge branch 'revert-153-ADWD-1367' into develop