added query string cleaning