fixed Auth queries