[cinemassacre] Keep both extraction approaches and make more robust (Closes #4109)