Tagged upstream-planning