query index works, large changes to storeobject