I’ll solder the folded tabs first thing.
When it was in place on the main line with power on both the up and down stream side of the switch I did not have any issue. It was just when I relocated it to a different position on the layout with power only on one side of the switch that this issue has raised its head.
Perhaps it’s been like this but with there being power on both sides in its previous location I did not see the issue?