Using ProductQuery while checking for brand/category products, changed variable name to type instead of element type, made implicit request optional on ProductQuery.