[Fix] Fixed issue due to which selected CU not remaining selected when filtering UI  was closed with a mouse click. Closes #47