Add subtypes_or_product helper to Branch helper
Improve subtypes_or_product Branch helper