fix expression syntax to use tokenList