Fixed the problem of adding all locations to all the partition keys at once