Further to my post last night about mayonnaise helping to remove water marks.
It doesn't work! Left greasy dark patches on the furniture. I have washed it with soapy water a few times and polished it twice. It has calmed down mostly but the water marks are still there and the surface is slightly darker than the surrounding area.
So the One Show spread untrue facts after all.