better media entity support