Updating to properly filter bucket 7 and 30 day buckets