fixed search. again