Tidy up video filtering