fixed #200, query is completely removed