Queries reviewed for some required fields and GSPs fields made selected by default