add SQL-rewrite-universal