Advanced Search: fixing query boxes