Uppercase tag support added