Added search to dropdowns on query pages if number of options >7

Change-Id: Ic51c13d12db6689927cff5988db920725a94d6ae
Merge "Added search to dropdowns on query pages if number of options >7"