Updated filter for new WP