typo in server names. fix handling of unpaginated results.