includeSubcategories option added