Fixed auth token queries