further change data model to require even less hasLabel checks