TEIIDDES-2379 added filterering of target object from choices list