Add all terms to group by, although I'm not sure about the previous commit as it...