Titles handling improvement