Finally fix Index from Thread navigation