Fixes for block pagination and dynamic block zone-rerendering