Fixed umbrella connection issue with option sets