added #query and StoreQuery