Fix grouping of visibility conditions for power options

Thanks phil65