Initial work for index navigation improvements.