some reformatting of top-terms.js
merge, resolve conflicts