Add QbGroup logic