Added token separators for tags.