Extrafields pagination

Fix for extrafields pagination.