Moving to data- attributes in forms