Better fix for multiwaterlevel in globals
Waterlevel and Multiwaterlevel enhancements