Fixed search form layout, and fixed positions on new search form field to be max+1