Improve trend-view
Fix sankey-view
merge master