Update for new Title tag handling