Support unlisted terms
Merge commit 'fc0385c3e68dc81f130f283ca6b41b7d6cf0a569'