Issue #220 - fixing broken excluded and included field elements