rm resetQuery(), resolves #36