Actually fixed index querying