I think I need to revert that last change. But I don't see how your idea will work. To me, we need to retry for each type as we can not know if the type was the river or not.