#29759 template take from db if override checked. updated template