[fix] updated tagging - works on api now not only ETL