Don't create Switch objects automatically unless their labels are listed.  Query tweak.

I think it's a bit nicer this way, as it will prevent typos of switch labels.  See what you think.