fixed query test for org. structure, just for now. also impl on matchObject started, not finished yet.