Better File Entity Display Support