Bugs with search is fixed