Add indexPath queries