Fixing issue with rewrites warning for URLs containing query strings