modify previous filters to allow classes and id's to be passed