EBD-12071: ensure that we are correctly sorting the objects.
EBD-12071: rename the annotation property.