Removed hacky trick to correctly render titles