Re #10681 Minor bugs in setting energy list.