Add key binding for the new isearch func & some cleanup