river: update server wide river parts for new aggregator format
river: 2 more tweaks to server wide river