Search Box updates

more refinements