More parameter name fixing and honor "collapse_unique"
"Grouping"-feature