Added companies language to query & translations
Merge origin/master