fixes in HTML data source - state is correctly preserved on redraw - close #468