Merge "Move query methods"