WP-2044: prevent double container on filter by.