Restored search and pagination functionality.