issue/1300-analytics-activity-recreate

Fix #1300 - analytics now takes activity re-creation into account