fixed search a bit