Fixed URL rewriting