Group By and Order By field cleaning

• Clean group by and order by field names, as they can not use placeholders, to help prevent injection attacks
• Migration testing
• Better default field generation