[DF-3347] Fixed creation of switch component