Fixed category collection to include matching or matching with children