Yes, they could, you're completely right.
Is that working properly? Yes, it is.
Is that extremely important for now to change this? I don't think so
Will I change this? No, not for now. I may change this when I have more time and we don't have a release next week