LPS-45262

Hi Brian, 
this pull solves the problem of the *missing* language keys. Anyhow I would like to keep on reorganizing other parts of the code related to this because IMHO there is still room for improvement. 

Thx in advance.