Term filtering tweaks