Almost have new secondary index queries working