- Fix Water View using weird way
- Fix bookmark bug.