fix media entity problems