What does this MR do?

This MR addresses the feedback left in !47294 (merged). The previous MR was merged quickly in order to fix a priority1 bug. This MR fixes the issues brought up in that MR, but were marked to be fixed in a follow-up.

Does this MR meet the acceptance criteria?

Conformity

• [-] Changelog entry
• [-] Documentation (if required)
• Code review guidelines
• Merge request performance guidelines
• [-] Style guides
• [-] Database guides
• Separation of EE specific content

Availability and Testing

• Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.
• Tested in all supported browsers
• [-] Informed Infrastructure department of a default or new setting change, if applicable per definition of done