Implemented search and few other small changes.
Merge remote-tracking branch 'origin/master'
Small change to Search code.