fix bug 935013 - Search form improvements
Merge pull request #1592 from darkwing/search-form-improvements-935013

fix bug 935013 - Search form improvements