Improve selected index paths