Updated to use ESPaginator to make only a single request (bug 963730)