added search case and highlighing