limit atom entries to 20
Merge branch 'origin/draft'