Use history-beginning-search
Switch back to up/down-line-or-search