Fix to use and display of ObjectIds