fix search panel
fix merge conflict
Merge pull request #92 from dmitryshilin/search_form

Search form