further unified all types of metrics around grouping, filtering, and …

…control-comparison splitting

Signed-off-by: dafnapension <dafnashein@yahoo.com>