Added Undo & Retry AutoComplete