Wouldn't it be interesting to unfreeze the development and see if you can't refactor to avoid unnecessary queries?
Code topology can heavily affect the amount of queries.
What I meant was feature development... that's what got frozen long ago... code revision exclusively for performance optimization has been ongoing continually.
