BugFix: correct optgroup boundaries (although date,lat,lon will be "magically" added to the last optgroup)