Added query support, fixed bug where readers where not being disposed of
added files -> Added query support, fixed bug where readers where not being disposed of