O have never complete the troubleshoot of this but that sw needs a thicker or no O-ring to properly works, I think.Just found it.
https://www.amazon.com/gp/product/B002H99MYM/?tag=wranglerorg-20
and the wire harness
https://www.amazon.com/gp/product/B000C9MZIO/?tag=wranglerorg-20