Search setup added.

Change-Id: I2497f37d8ad5ab14933ed3c01ccd54c2d6785dd3
Bug solved

Change-Id: I77bd6094b6390bb400d613676a0c040bd12d74b9