LPS-51101 SF

Hey Marcellus, 

the changes look good to me. They fix a problem introduced by changing the way we store the localizations now.

thanks!