Added auto-filtering capability