#14: Fixed field drop down searches