fix for tokens query ; tested w/ production