UltimateAnswer - Fix primary query