Removed toUpperCase conversion to tags