Better responsiveness on index