fix reserved keyword + crappy data attributes