Switch common tag of criterion handlers to content and location tags