Fixed searchcontainer to include first level containers