Update logic for views token replacement.

Closes #3566786

Merge request reports

Loading