Merge "Sanitizer::escapeId: Decode entity before replacing spaces"