diff --git a/DataQuality/GoodRunsLists/python/OfficialGRLs.py b/DataQuality/GoodRunsLists/python/OfficialGRLs.py
index 6278b1acc576a7a6ffd5e70dec6354a1e0b6b16c..ac55a4c9ee3f9123f69e2070bc239377ea6ac162 100644
--- a/DataQuality/GoodRunsLists/python/OfficialGRLs.py
+++ b/DataQuality/GoodRunsLists/python/OfficialGRLs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ## Official collection of GRL maintained and produced by DQ group.
 ## Last update: 2009-10-21, by Max Baak
@@ -8,19 +8,18 @@
 class OfficialGRLs:
   def __init__(self):
 
-    self.collection = [	
-			'GoodRunsLists.jetetmiss_windet_900GeV',
-			'GoodRunsLists.jetetmiss_woindet_900GeV',
-			'GoodRunsLists.jetetmiss_woindet_2TeV',
-			'GoodRunsLists.jetetmiss_jetmetok_woindet_2TeV',
-			'GoodRunsLists.jetetmiss_jetmetok_woindet_900GeV',
-			'GoodRunsLists.jetetmiss_jetmetok_windet_900GeV',
-			'GoodRunsLists.minbias_2TeV',
-			'GoodRunsLists.minbias_900GeV',
-			'GoodRunsLists.minbias_solon_900GeV',
-			'GoodRunsLists.minbias_solon_windet_900GeV',
-			'GoodRunsLists.minbias_solon_2TeV',
-			'GoodRunsLists.minbias_stable_900GeV',
-			'GoodRunsLists.minbias_windet_900GeV',
-              	      ]
-
+    self.collection = [
+                        'GoodRunsLists.jetetmiss_windet_900GeV',
+                        'GoodRunsLists.jetetmiss_woindet_900GeV',
+                        'GoodRunsLists.jetetmiss_woindet_2TeV',
+                        'GoodRunsLists.jetetmiss_jetmetok_woindet_2TeV',
+                        'GoodRunsLists.jetetmiss_jetmetok_woindet_900GeV',
+                        'GoodRunsLists.jetetmiss_jetmetok_windet_900GeV',
+                        'GoodRunsLists.minbias_2TeV',
+                        'GoodRunsLists.minbias_900GeV',
+                        'GoodRunsLists.minbias_solon_900GeV',
+                        'GoodRunsLists.minbias_solon_windet_900GeV',
+                        'GoodRunsLists.minbias_solon_2TeV',
+                        'GoodRunsLists.minbias_stable_900GeV',
+                        'GoodRunsLists.minbias_windet_900GeV',
+                      ]
diff --git a/DataQuality/GoodRunsLists/python/WZcommon.py b/DataQuality/GoodRunsLists/python/WZcommon.py
index afca1c56444f8108b9db0abfe124ebd1e9e93930..73df674a2769be17cbdc368b5713d68efb7f009a 100644
--- a/DataQuality/GoodRunsLists/python/WZcommon.py
+++ b/DataQuality/GoodRunsLists/python/WZcommon.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -23,19 +23,19 @@ class WZcommon(GoodRunsListConfig):
     self.querydict['ptag'] = ["data10_7TeV"]
 
     ## See http://atlas-runquery.cern.ch for more user examples.
-    dqflagsquery = [ 	'ATLGL LBSUMM#DetStatus-v03-repro04-01 g', 
-			'L1CTP LBSUMM#DetStatus-v03-repro04-01 g', 
-			'ATLSOL LBSUMM#DetStatus-v03-repro04-01 g', 
-			'ATLTOR LBSUMM#DetStatus-v03-repro04-01 g',
-                     	'L1CAL LBSUMM#DetStatus-v03-repro04-01 g', 
-			'L1MUE LBSUMM#DetStatus-v03-repro04-01 g', 
-			'L1MUB LBSUMM#DetStatus-v03-repro04-01 g', 
-			'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_mu_mmuidcb LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_mu_mstaco LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_met LBSUMM#DetStatus-v03-repro04-01 g',
-		   ]
+    dqflagsquery = [    'ATLGL LBSUMM#DetStatus-v03-repro04-01 g',
+                        'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
+                        'ATLSOL LBSUMM#DetStatus-v03-repro04-01 g',
+                        'ATLTOR LBSUMM#DetStatus-v03-repro04-01 g',
+                        'L1CAL LBSUMM#DetStatus-v03-repro04-01 g',
+                        'L1MUE LBSUMM#DetStatus-v03-repro04-01 g',
+                        'L1MUB LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_mu_mmuidcb LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_mu_mstaco LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_met LBSUMM#DetStatus-v03-repro04-01 g',
+                   ]
 
     ## Set the dqflags query
     self.querydict['dq'] = dqflagsquery
diff --git a/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py b/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py
index 2244feb7e743c9457c28418bb557390ca227bb5d..cd854e4ff35dbd3b8bbce533ad3bba8f5336845e 100644
--- a/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py
+++ b/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -29,7 +29,7 @@ class Zeechannel_fwd(GoodRunsListConfig):
                         'L1CAL LBSUMM#DetStatus-v03-repro04-01 g',
                         'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
                         'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
-		        'cp_eg_electron_forward LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_eg_electron_forward LBSUMM#DetStatus-v03-repro04-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py
index 15f2157b4f0fa1e3bf0e3b586bcc33e1283c74d2..8a2bbd80a4f545c5298a7ebc2834d94b5fd59362 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_windet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar     LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar     LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'pix     LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'sct     LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py
index 10f78672ac07771aea631eadbd7231fcbd9f3ff0..cc3c353f1eaa031d2047f377013fb5155cc7b38f 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_woindet_2TeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL    LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP    LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar        LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile      LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar        LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile      LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetb      LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetea    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetec    LBSUMM#DetStatusLBSUMM-December09-01 g', 
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py
index ffd15a92932b00f1ac5c4ddff2f43ee35f66dd82..877483642af2e93ebe8799e08b6362f2ecf63ebc 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_woindet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar     LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar     LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetb    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetea   LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'jetec   LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py
index 3e8e666bf5e4454da4d6d881de0756e671a07635..aac2af112087403c11d8c491dbbca6310a09e039 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_windet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'pix    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'sct    LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py
index 8f4792e7f24a44f00042dba05d0c0a15040e3fe3..d5dbd30fff0d15b36bad5ad509b1b14a8f41bd03 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_woindet_2TeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
                      ##'jetb yellow+  ',
                      ##'jetea yellow+ ',
                      ##'jetec yellow+ ', 
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py
index b589cef33b0f57856a3f482807b63baab65b2d08..5d0b6ffc7f882570086b5172980aafcb8c5261d1 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_woindet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'lar    LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'tile   LBSUMM#DetStatusLBSUMM-December09-01 g',
                      ##'jetb yellow+  ',
                      ##'jetea yellow+ ',
                      ##'jetec yellow+ ', 
diff --git a/DataQuality/GoodRunsLists/python/minbias_2TeV.py b/DataQuality/GoodRunsLists/python/minbias_2TeV.py
index b289e5c06ecf0aee25682c807cb0accae7c4ade4..25981c3bc98fa5fe5c68d716bb8301a9a5f71ba7 100644
--- a/DataQuality/GoodRunsLists/python/minbias_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_2TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_2TeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_900GeV.py
index 6703961cd41b3549a39d924470209cb27cc1182a..f856b180745fb760e7f268fbb07a710dde11e99e 100644
--- a/DataQuality/GoodRunsLists/python/minbias_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py
index fe81cf16d3c346f116138653a1b07d090c6ab3b4..6eb78f4f2408f78ef192888e591d3ea9558b96c3 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_2TeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py
index 5617306d2d99910f2c7d4fbf5ff2b5343e0b2805..69c116c50b7dc57dc9324b06c0257f8b4afa5de8 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py
index 465432e55ac971886dbed6c7e8b1e4d33bb6acf3..f69f99669e622eadabc35f6e3642ad49f1a6978b 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_windet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP   LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'atlsol  LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'pix     LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'sct     LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py
index dd62a26b78554ec61ef36c495eb96df7e1e14443..c4da3c6c50f5922878724986a682b6b745d5f3e0 100644
--- a/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_stable_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py
index a0b771fecaeec7c1a10e303de9374ab0ec4f8e17..fdaa270e874b3a6fa769fb3cc07bcef4393fc203 100644
--- a/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_windet_900GeV(GoodRunsListConfig):
     self.querydict['st']   = ["physics_MinBias"]
 
     dqflagsquery = [ 'ATLGL     LBSUMM#DetStatusLBSUMM-December09-01 g',
-		     'L1CTP     LBSUMM#DetStatusLBSUMM-December09-01 g',
+                     'L1CTP     LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'pix       LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'sct       LBSUMM#DetStatusLBSUMM-December09-01 g',
                      'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/muon_7TeV.py b/DataQuality/GoodRunsLists/python/muon_7TeV.py
index ac665bacb1d24a344fa70d6ce0667b73c0142650..a34cc0f26f1f98b835639f0d6a728d0a705acebd 100644
--- a/DataQuality/GoodRunsLists/python/muon_7TeV.py
+++ b/DataQuality/GoodRunsLists/python/muon_7TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -30,10 +30,10 @@ class muon_7TeV(GoodRunsListConfig):
                      'pix        SHIFTOFL#HEAD  g',
                      'sct        SHIFTOFL#HEAD  g',
                      'trtb,trte  SHIFTOFL#HEAD  y+',
-		     'mdt        SHIFTOFL#HEAD  g',
-		     'rpc        SHIFTOFL#HEAD  g',
-		     'tgc        SHIFTOFL#HEAD  g',
-		     'csc        SHIFTOFL#HEAD  g',
+                     'mdt        SHIFTOFL#HEAD  g',
+                     'rpc        SHIFTOFL#HEAD  g',
+                     'tgc        SHIFTOFL#HEAD  g',
+                     'csc        SHIFTOFL#HEAD  g',
                    ]
 
     ## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/susy_7TeV.py b/DataQuality/GoodRunsLists/python/susy_7TeV.py
index 3f85eb99ccd7fed767d7c09d512741503c282909..9a727c5123c7657ad0caef787f30f6f4c8fb6aed 100644
--- a/DataQuality/GoodRunsLists/python/susy_7TeV.py
+++ b/DataQuality/GoodRunsLists/python/susy_7TeV.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -19,21 +19,21 @@ class susy_7TeV(GoodRunsListConfig):
     self.querydict['ptag'] = ["data10_7TeV"]
 
     dqflagsquery = [    'ATLGL LBSUMM#DetStatus-v03-repro04-01 g',
-			'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
-			'CP_MU_MMUIDCB LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
-			'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
-			#'cp_jet_jetb  g',
-			#'cp_jet_jetea  g',
-			#'cp_jet_jetec  g',
-			#'cp_met_metcalo  g',
-			#'cp_met_metmuon  g',
-			#'trmet  g',
-			#'trjet  g',
-			#'trmuo  g',
-			#'trele  g',
-			'bs LBSUMM#DetStatus-v03-repro04-01 g',
-			'lumi LBSUMM#DetStatus-v03-repro04-01 g',
+                        'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
+                        'CP_MU_MMUIDCB LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
+                        'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
+                        #'cp_jet_jetb  g',
+                        #'cp_jet_jetea  g',
+                        #'cp_jet_jetec  g',
+                        #'cp_met_metcalo  g',
+                        #'cp_met_metmuon  g',
+                        #'trmet  g',
+                        #'trjet  g',
+                        #'trmuo  g',
+                        #'trele  g',
+                        'bs LBSUMM#DetStatus-v03-repro04-01 g',
+                        'lumi LBSUMM#DetStatus-v03-repro04-01 g',
                    ] 
 
     ## Set the dqflags query