Move select element to hook class

Closes #3574727

Merge request reports

Loading