Made changes to query locally, deployed, and tested them here https://wmcs-edits.wmflabs.org (see for more details in the parent task T240040#5737860)
This task is about updating the queries so that we get the data automatically generated in the upcoming months via reportupdater.