IDEX-488 : Fix invalid $10 and more variables. Also allow to use as vari...

...ables as needed