add missing switches. swap order of nested SR switches