Fixed the undefined-subtitle-bug for all cases without a subtitle

… also, added a small-tag that encapsulates the subtitle