fixed search handlers