Little entity view fix