Fix307: Attribution and MediaSource Missing

Fixes #307 by aligning attribution and media source fields to the new entities format.

Code Review (Approved by Michael): http://mrccodereview.cloudapp.net/ui#review:id=1151