Fix issue with empty buckets

Prefilter the zones list to ensure every bucket has zones.

Fixes #1.