Add terms check and silent skip.
Merge branch 'lookup_plugins_merged'