Support applying token filters
Follow API change