Make advanced search respect model search fields list
Fix grid columns not being respected