Added consistency to search forms markup