Improve terms list