Filter powered on/off nodes correctly

Change-Id: I57f31291556b579e2495c7daefe650e47634eade
Merge "Filter powered on/off nodes correctly"