MDL-37482: Fix problem with select default values introduced by original patch