Fixed entity view issues