fix(api,dashboard): Correct variable generation and parsing

fix(api,dashboard): Correct variable generation and parsing #25809