Re-organize search UI
Make priority fields optional in the UI
Fixed fields order in the UI