cleanup tags - fix #189