Issue #3625813 by DamienMcKenna: Fix single value terms.

Damien McKennarequested to merge
issue/exif-3625813:3625813-single-values into 8.x-2.x

Closes #3625813

Merge request reports