Version 3.1: Try to figure out how to display terms smarter