CJ-1054

shorter completion strings