Revert "try to fix groups with a new qry"
Revert "try to fix groups with a new qry"

This reverts commit 8f19855cd0742e3ca9cb97d2287fbfbe48507d51.

frankmullenger/centralflirt,frankmullenger/centralflirt,frankmullenger/centralflirt