Some changes to search. Looking good