fix 1st return search problem

Make sure to find the real fastest path
0 -> 1 -> 2 -> 0 -> 1 ...  in return search index.