Storefront: default html5 template bugfixes (part1)