Add other types to give a more robust grouping proc

Add other types to give a more robust grouping proc #2116