Include outbound/return info in URL generator [#81580124]