some clean-up + more robust matching of tour steps -> uri path