company select box fixed
Merge branch 'hotfix/company-select-box'