just arrived in Dubai, what a beautiful airport! It's close to midnight Sunday night here, so there'll be no scouting around.
Highly recommend Emirates Airlines.
Had an idea on the water situation. I brought about 50 packages of Sea Monkeys (R) and figure I'll empty a package into any water, the Sea Monkeys will eat anything in the glass making it safe to drink. Will let you know how it goes.