entities should be expanded in attributes too