Fix/improve queue rebuilds so they take into account partial workloads and the need to always process watchlist feeds.