WP-2044: restore search container.