CON-105: Select field - code changes