unreverted commit 14721e4: completions with menu