Added more token filters