Update pagination args/headers

Part of #4055