Water: handle null when checking patch occupation
Add water model to index page