Move "offset" and "limit" parameters into "output" section