[PATCH 2/5] tag escape fix