OOIION1920: Support UI search
Merge pull request #591 from mmeisinger/fix1920_disc

OOIION1920: Support UI search