diff --git a/roles/web-data-analysis/files/mirrors-data.awk b/roles/web-data-analysis/files/mirrors-data.awk
index b265186b54..bcf8845f7b 100644
--- a/roles/web-data-analysis/files/mirrors-data.awk
+++ b/roles/web-data-analysis/files/mirrors-data.awk
@@ -76,6 +76,10 @@ BEGIN{
 	else if ($3 ~"epel5")  { epel5=epel5+1; epel=epel+1}
 	else if ($3 ~"epel6")  { epel6=epel6+1; epel=epel+1}
 	else if ($3 ~"epel7")  { epel7=epel7+1; epel=epel+1}
+	else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; f27=f27+1; modular=modular+1; fedora=fedora+1 }
+	else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; f28=f28+1; modular=modular+1; fedora=fedora+1 }
+	else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; f29=f29+1; modular=modular+1; fedora=fedora+1 }
+	else if ($3 ~"modular_f30") { modular_f30=modular_f30+1; f30=f30+1; modular=modular+1; fedora=fedora+1 }
 	else if ($3 ~"f03")     { f03=f03+1; fedora=fedora+1}
 	else if ($3 ~"f04")     { f04=f04+1; fedora=fedora+1}
 	else if ($3 ~"f05")     { f05=f05+1; fedora=fedora+1}
@@ -104,12 +108,8 @@ BEGIN{
 	else if ($3 ~"f28")     { f28=f28+1; fedora=fedora+1}
 	else if ($3 ~"f29")     { f29=f29+1; fedora=fedora+1}
 	else if ($3 ~"f30")     { f30=f30+1; fedora=fedora+1}
-	else if ($3 ~"rawhide_modular") { rawhide_modular=rawhide_modular+1; modular=modular+1; fedora=fedora+1}
+	else if ($3 ~"rawhide_modular") { rawhide_modular=rawhide_modular+1; rawhide=rawhide+1; modular=modular+1; fedora=fedora+1}
 	else if ($3 ~"rawhide") { rawhide=rawhide+1; fedora=fedora+1}
-	else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; modular=modular+1; fedora=fedora+1 }
-	else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; modular=modular+1; fedora=fedora+1 }
-	else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; modular=modular+1; fedora=fedora+1 }
-	else if ($3 ~"modular_f30") { modular_f30=modular_f30+1; modular=modular+1; fedora=fedora+1 }
 	else if ($3 ~"modular") { modular=modular+1; fedora=fedora+1 }
 	else if ($3 ~"centos") { centos=centos+1; epel=epel+1}
 	else if ($3 ~"rhel") { rhel=rhel+1; epel=epel+1}