Fixed Enzyme pharma + Added proper filtering