Bug fixes

Added the missing GROUP BY keyword sequence and added a semi-colon (;)
as an operator to correct issue with keywords not being highlighted when
immediately proceeded by one.