fix regex for tags
improve cleaning