Fix issue w.r.t URI comparison when querystring is used