[#42198561] Ensure ID is not escaped