[nuvid] Improve extraction