Fix modification of entity metadata items