More fixes to day/night for select fields