Some changes in listing generating.