Search modified

Made the changes in 'Search' according to the changes in models. You can merge this.  
Okay. Thanks for telling. :)