Merge branch 'hotfix/improved_index_charts_2'
Another atempt to fix the group_by error on postgres
Merge branch 'hotfix/improved_index_charts_3' into develop