Fixed problem with Search
changes