Ummmm.......
If you really think you have "the yellow wire in the wrong terminal" I really don't think you should be attempting to change a plug fuse, let alone re-wire a light switch....
Sorry if that sounds harsh, but the yellow wire you mention will be the earth, and if you really...