cleanup + additional support for compareActivities navigation (from bookmark)