Resolved merge conflics
Compiled JS
Refactored grid search fields, list and combo