Took id and label out of placeholders to prevent encoding

Nikki Peelrequested to merge
issue/trash-3581657:3581657-3x into 3.x

Closes #3581657

Merge request reports