fixed search and added color highlighting