fixing a bug with searchFocus
fixing merge conflict