Fixed tokens issues + removed htmlentities in commands created through system/command/add