fix replace columns. added Query