added filtering capability