WP-2044: restore search container.
WP-2044: prevent double container on filter by.