Fx a bug with entities
+ form labels and fields are now wrapped together in a span element.