Fixed Search

Change-Id: I15e30bdb085e3b01ec642dfe39bd149b8406dd8e