fixed search handler