fix bugs related to change in data attribute convention change
fix bugs related to change in data attribute convention change