Improved handling for grouped lights