Fixed character type issue with id vs UID