reverted and fixed search
fixed search