fix bug 935013 - Search form improvements

https://bugzilla.mozilla.org/show_bug.cgi?id=935013