refactored filters in the ocl module