Subtitle handling after content has been retrieved refactored