OCS Search fixed