Outfall Upstream catchment in SewerGEMS

The catchment in SewerGEMS (Stand Alone) are still not considered as being "upstream" and will not be selected when using the "Trace upstream" Network Navigator query, we need to select the contributed catchment to the specified outfall, I found that could be a workaround in "SewerGEMS for ArcMap" but we need that feature in the stand alone.

another feature is really required in the Stand alone version is snapping tools specially to allocate the Tap exactly (x,y) to the pipe.

Regards,

Mohamad Azzam