Hats off to you, Benibiker, if this is a cross-the-board solution! I'll get my head under the bonnet again this evening to investigate. Your attachment wouldn't load for me though, may just be my PC having a bad day ...
PS Where did you get your spring?
