LPS-48209 Fix entrySearch to extend SearchContainer in correct manner.