Remove restriction on ID formats and avoid XSS issues