restored map search form for enter-submission
merge mapfix