Fix entity view