Add some additional rewrites