[Feature/Fix] Filtering CUs: now closing the filtering UI will lead to select CU remaining selected (if there was one).

Plus, improved handling of input to filtering search box, which fixes a couple of minor issues