Add: Support grouped products and brand fallback