ART-1195: improved selection