Updated: Returning large lists of users should be quicker now