enhanced the title substitution after some real usage