[tvp] Improve and add new extractor

No, it's only for description. But since it's optional I'll drop this whole `if`.