[tvp] Improve and add new extractor

Why not simply embed this into the above regexp?