Fix support for ids with characters in need of escaping.