lots of fixes for displaying / query group_by datasets