Reviewer Mike - Better upstream routing logic

As discussed... Tested in UT.