correctly treating html character entities

any html character entities following a url are now not being treated like part of the query string
properly handling &amp; character as part of the url