I've looked at all 333 instances of "beforeQuery" individually, and all look like they should be "before" except for 7 hits, all method names similar to AbstractProducedQuery.beforeQuery()
Does that sound right?
I'll take a look at the "afterQuery" instances and create a PR.
thanks but there is no need for a separate PR for afterQuery.
Don't worry, I'm planning a single PR for both issues.
I wanted to check the work so far.
Applied PR upstream.