Fix missing data bug & media style