fix expression in statements
remove 'data-' hack