Fix content block ordering with new pagination options