Update and refactor RollupQuery to fit proper needs
See last comments