Make routing work better (fix index error)