PROBCORE-64 Refactored the definition of the elements for selection.