Attempt to fix group by for live
Attempt to fix group by for live 2