Added implicit search for Ok to allow filtering.
Merge branches 'ok-filter' and 'master'