Improved valid links retrieving to work using lists