Changes for Search.

Signed-off-by: Babita Dhami <babita.dhami@evontech.com>