fix rebase
fix map for search
Merge pull request #241 from Verkalets/fix_all_issue

Fix all issue