Added getUriWithoutQuery method