more work towards re-enabling summary mode