[PATCH 0/9] Fix a slightly rework auto completion