[#42198561] Ensure ID is correct given escaping