Refactoring of Product Filter