LPS-33642 Apply new search container pattern