Plot fixed and tested. A display bug remains.

result_group based solution.