added filtering capabilities