fixes for data attrs