Support groups in query builder drop boxes