fix bug 947832, 944560, 937136, 914797, 914946 - Remove TOC counters and indent listing

https://www.youtube.com/watch?v=koJlIGDImiU