More things to escape in the UID