Search function rehauled, form redesigned