remove query problem and parsing