Merged in fixes from v1.55, fixed couple queries related to jobgroups