|#000| refactoring, removing empty fields from User json
|#000| refactoring, using default locale in bundle lookup