BAZYNGO-769 Fix CategoryQuery to return proper resources