Presume the null checks for HD and media type will be removed when we ingest these fields from PA?