Get rid of ocepoc, expand query