[DF-185] Added default to switch