In the case of a reservoir, some American topo maps depict the river’s original course at the bottom of the lakebed and label it as the river. If this is unwanted, a renderer could layer the reservoir over the waterway or perform a spatial query to knock it out. Perhaps the possibility of a spatial query means we don’t need a new tag for the submerged portion of the river?