Naive attempt at fixing Underscore templates

What does this MR do?

Attempts to fix part of #18939 (closed).

Are there points in the code the reviewer needs to double check?

That this doesn't break anything.

Why was this MR needed?

See #18939 (closed).

What are the relevant issue numbers?

#18939 (closed)

Does this MR meet the acceptance criteria?

• Tests
  • Added for this feature/bug
  • All builds are passing