Removed hard-coded perPage value