Bug/empty attribute values

### Description
Empty attribute values were understood as compound values.
Now more checks are done, to avoid this 'misunderstanding'