fix `where` token handling