fix: improve how buckets are managed in the store (#196)

fix: improve how buckets are managed in the store (#196) #567