Added fix for history-substring-search