[TASK] Move FieldControl/ResetSelection handling to module