SEO friendly URL patch 2