Yes, you are right this whole method is a little confused and I think that there is a scenario where a 'Active' domain that was not 'defaultOn' would not get displayed to the user for turning on/off -- I think ? I have merged in your other pull request that address this. I _think_ your change actually manages to do what was intended here in a much more concise and accurate way (unless I have forgotten something here).

Thanks.