add some rewrites