Preserve buckets in views when filtering

Looking deeper I found this issue that I believe is the same thing: