[FOLLOWUP][TASK] Streamline select field value handling