FIX: change id elements to data elements

- change id elements to data elements (leftovers from debuging)