Fix groupings label sort


I want to fix sorting the chart grouping labels [1] and came up with two

extend [2] to look on all labels and not only on CF labels

as far as I see there are only Date fields where the label sorting have
to be fixed so decide in [3] based on the SubFields if we sort ‘raw’ or
’numeric raw’

Is there something that speaks for or against one of the solutions?