Fix problems caused by lost data- prefix on attributes