A product called "Lemi-Shine" may help. Bottle says: 1/4C in 16 oz spray bottle with water; shake to dissolve; spray, wipe, rinse. I also use it to get my dishwasher from etching stemware. Also to get hard water stains out of vases.
They have a website (www.lemishine.com); you can click on your state & will list the stores that carry it locally. I got mine at Albertsons, then purchased online. Good luck. Anne