Improve entity show