Major upgrades to query all the protocol datasets