SEO-friendly-URL patch 3