OOIION-1920: Enhanced support for UI search