finally fixed search case