Fixed empty selects fields