Untested support for replace queries