port fixes to doctor star titletext to master from mustache