Fixed index querying as well