Update load logic for entity view