Fix for Search

+ Fix for Search