Filter on the EXCLUDED-NAMES list at highlight in addition to when query building