fix new structure of cms