Gets rid of some extra test and fixes logic for 0 videos/audios