[issue #22] completely removed query management