Support --match_columns and --query