Query: Fixed error where a bucket was not being found and so was created many times.