final fix for view-entity