Fixed a major issue with retreiving more than 200 names