search form and fixes