Storefront: bug fix of hard set tpl for content block