On solid wood tops I have removed water marks by applying a little metholated Spirit with a piece of cotton wool or the like. Them quickly light it after first removing an sealig you bottle of meths.
This need care and dexterity in a safe place. but water marks just disapear.