CMS-2922 Bucket view must consider new buckets also, not only existing