Fixing the element tags