Change parameters of addMatchViewToMap; constructors and destructors in MatchView (like in FilterView)