Fix search form and items