Restoring version with "selected_entity" stuff