Changes in removing "General" and "Media"