Fixup search form