fixing changes to data-id