VIVO-326 collate by subclass for qualified properties