More index page query fixes