Fix handling of empty labels and descriptions when creating entities