More log.  Do not delete query state in EStore. In stead, modify the state in EStore.