OPAL-1820 MVP refactoring, code clean up, fixed closeable search items handling
Closeable style