diff --git a/pyproject.toml b/pyproject.toml
index da65b32..629e0da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dbms"
-version = "2.0.6"
+version = "2.0.7"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
diff --git a/src/rda_python_dbms/pgchksum.py b/src/rda_python_dbms/pgchksum.py
index 4e4577d..88c0d8b 100644
--- a/src/rda_python_dbms/pgchksum.py
+++ b/src/rda_python_dbms/pgchksum.py
@@ -176,7 +176,7 @@ def send_check_email(self, cnt, fcnt):
    # get the checksum filelist for wfile
    def get_checksum_wfilelist(self):
       self.PVALS['TYPE'] = "Web"
-      self.PVALS['BUCKET'] = 'rda-data'
+      self.PVALS['BUCKET'] = 'gdex-data'
       flds = "wid, wfile, type, locflag, data_size, checksum, date_modified, time_modified"
       if self.PGSUM['f']:
          pgrecs = self.pgmhget('wfile', 'wid, dsid', {'wfile' : self.PGSUM['f']})
@@ -211,11 +211,15 @@ def get_checksum_wfilelist(self):
          cnt = len(pgrecs['wid']) if pgrecs else 0
          wfrecs = {}
          if cnt > 0:
+            tmpcnt = 0
             for i in range(cnt):
                dsid = pgrecs['dsid'][i]
                pgrec = self.pgget_wfile(dsid, flds, 'wid = {}'.format(pgrecs['wid'][i]))
-               pgrec['dsid'] = dsid
-               self.addrecord(wfrecs, pgrec, i)
+               if pgrec:
+                  pgrec['dsid'] = dsid
+                  self.addrecord(wfrecs, pgrec, tmpcnt)
+                  tmpcnt += 1
+            cnt = tmpcnt
       if cnt > 0:
          if fcnt == 0 or fcnt > cnt: self.PGSUM['c'] = cnt
          self.PGSUM['f'] = wfrecs
@@ -226,7 +230,7 @@ def get_checksum_wfilelist(self):
    # get the checksum filelist for sfile
    def get_checksum_sfilelist(self):
       self.PVALS['TYPE'] = "Saved"
-      self.PVALS['BUCKET'] = 'rda-decsdata'
+      self.PVALS['BUCKET'] = 'gdex-decsdata'
       flds = "sid, sfile, dsid, type, locflag, data_size, checksum, date_modified, time_modified"
       hcnd = {}
       fcnt = self.PGSUM['c']
@@ -331,7 +335,7 @@ def evaluate_webfile_checksum(self, fcnt, pgrecs, cnts):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['wfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-data', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['wfile']
             if not re.match(r'^/', fname):
@@ -348,7 +352,7 @@ def evaluate_savedfile_checksum(self, fcnt, pgrecs, cnts):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['sfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-decsdata', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['sfile']
             if not re.match(r'^/', fname):