3/3 Object Highlighting & DbObject collection fixes