SearchContainer Fix