Improve redraw_echo
Fix completion kind problem