Fixed missing fields, pagination