Additional fixes for the 5x renderer.

[travist]

Link to Jira Ticket

https://formio.atlassian.net/browse/FIO-XXXX

Description

What changed?

Use this section to provide a summary description of the changes you've made

Why have you chosen this solution?

Use this section to justify your choices

Breaking Changes / Backwards Compatibility

Use this section to describe any potentially breaking changes this PR introduces or any effects this PR might have on backwards compatibility

Dependencies

Use this section to list any dependent changes/PRs in other Form.io modules

How has this PR been tested?

Use this section to describe how you tested your changes; if you haven't included automated tests, justify your reasoning

Checklist:

• I have completed the above PR template
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation (if applicable)
• My changes generate no new warnings
• My changes include tests that prove my fix is effective (or that my feature works as intended)
• New and existing unit/integration tests pass locally with my changes
• Any dependent changes have corresponding PRs that are listed above