Fixed problem with token filtering