Add grouped query select back for now, will be removed when new choices impl progresses