Fixed parser to work with expressions in the text