#4082 supply module queriers for CLI and REST endpoints