Merge "Remove redundant input from search form"