Regexp changed to match URLs with query params