Feature/fix scenario route back

Wasn't able to get a fix for #541 in time for RRP, wanted to get these fixes in.