fixed map and fixed search_form
Merge remote-tracking branch 'origin/master'