fix handlebar templete bugs