Added more rewrite rules