CS
Fixed grouping by master field
Better support for single checkbox values