query method fixed, storage api was fixed