Temp Fix - analytics_tags issue