Add support for replace in query... not ready yet