This fix is good too (at least from my rudimentary testing).
Just a note for next time: this PR also includes the changes from the previous one. That's fine in this case, but if there had been a problem with the dashboard entity fix then it would have also held back this fix.
Ideally, let's try to keep the PR code changes as independent as possible so good fixes don't end up being blocked by ones that need more work ;)
This fix is good too (at least from my rudimentary testing).
Just a note for next time: this PR also includes the changes from the previous one. That's fine in this case, but if there had been a problem with the dashboard entity fix then it would have also held back this fix.
Ideally, let's try to keep the PR code changes as independent as possible so good fixes don't end up being blocked by ones that need more work ;)