update handling of systematic structures on batch