Version 3.5.1

Escaping group by fields and trimming unnecessary spaces