add loading & remove unnecessary tpl filter.