Reintroduced additional fields on edit orphan previously removed to get all specs green.