There is also filtered water avaiable in the parks at the French Market in NOS,
Rancho del Zocalo in Frontierland, Plaza Pavillion on Main Street, and the Tomorrowland Terrace. You can always fill your bottles there for free, and beats the water fountain water!