Improved performance for Feeds

With a high volume of data, some Feeds were loading very slow. This has been fixed.