Updated previous rule to be more aggressive, and additionally filter tags.