Changes to improve the search functionality

Signed-off-by: Deepak Jha <deepak.jha@turn.com>