The supply mains cable must be wired in a fireproof cable. An unswitched spur is not good enough for local isolation. You should fit a grid arrangement with a keyswitch and fuse to get the double pole isolation. I expect this will eventually filter through to all items that have an unswitched spur Even i got it wrong untill a couple of years ago.