#8 Fix url rewrite