move category to first column
fix unmatched tag