update token filter, overload operators