I would agree there’s certainly room for improvement, as you say to allow for both types of scenario.
I’ve raised it as a suggestion ( here) - if you’ve anything to add to that (or just support it by clicking on the star beside my post) please add it via the comment tag on the idea.