Refactored grid search fields, list and combo