fixes query methods