Fixes in double completion and keyword-like shortcuts