Tweak rewrite rules