Cleanup (OMS-295)
Fix search term parsing to accept values with colon (OMS-295)
Merge branch 'oms-295'