Add several more layers of filtering