Refactor #10026 SEO Strict URLs (optional)