Updated ISQL rewrite rules