Move company to subcompany when a subcompany is selected

Fix for https://github.com/Rise-Vision/common-header/issues/205