fix(query): metric name ColumnFilter should replace _bucket only when present in suffix

fix(query): metric name ColumnFilter should replace _bucket only when present in suffix #1931