R# cleanup
Additional mappings from pagination JSON