added behaviour so that switching between brands and/or components works as expected