Smarter use of hasVideo/hasAudio