Removed limit on 25 APs to be returned