Fixed the popular/homepage issue. Don't break it again!!