Content Items Media Source bug fixes