changed uuid tage to entity uuid