changes related to filter rewrite