Improve tokenization and add escaping of HTML attributes values