Fixes to pagination and broadcasts again