Escape more characters that shouldn't be in the ID