I suggest adding separate single click direct access tool or button (Water CAD/Water GEM) to selecting upstream and downstream pipes. It has the potential to save time and improve modeller's efficiency. This selection can be done through Navigator, but access to this feature is not user-friendly. Overall, the Navigator tool needs further improvement. It has lots of features, but most of them are hidden not user friendly.