Issue #2381359 by froboy, Dave Reid: Fixed un-replaceable tokens should be cleared out from the filtered text.