Reverted error message / paginated indexing