Added pagination handling to remove limit.