fixed some changes got lost somehow. Also the label method could do more

Some changes I did to the labels got lost which resulted into them not working anymore.
Also for some reason the method `.label(key)` was defined 3 times. Is there an explanation?

Anyways I fixed that!

Also I had the idea to move the generating of labels out of the fieldName into the label method so the schema wouldn't change but that did'n fit into this fix commit.