all basic query features implemented
query part finished, added single file version