Change WhSelect2 and fix WhActiveForm

See commit messages.