@Johani is part way through experimenting with a new component that should address this and a lot more.
I guess the highlight missing is a result of the refactor @Roman did?