Content Items Media Source bug fixes

Code review
http://mrccodereview.cloudapp.net/ui#review:id=1112