Fix nested listing
Finish task4