tokens fix and changed logger to html decode the log text string