Merge changes I30cb5eb1,Ib0a1a404

* changes:
  Fix download individual traces not working
  Make sure trace type shows at top of dataview