genericElementHandling: changed from two properties to one