Changes include:
- fix duplicate list items