Properly query for token