[livestream] Improve extraction (Closes #3513)