[Bug 409370] Adjustment of list results for easier postprocessing