Fix issue on wrong select values during edit