Add multi-criteria filtering