Fixed escaping null id