Improved fluid height calculation expression...

...to properly respect maxHeight