CLI Completion issues with variables

When variables are substituted, the command length his updated and makes completion logic to fail. The substitution needs to be taken into account at completion time.