WP-1947: restore search container.