Update select2
Set a local variable
Reorganize component hierarchy