Minor refactoring.
Perf WIP. 5327 Fix.
Cases quickbar logic fix.
Perf WIP