Removes the duplicated line in ecommerce theme and format correctly in multiflex Thanks: Alex Bodnaru for report