Fix remember query.