Default to activity => transactions when changing marketplace. Also test cleanup.