Improvements for finding company by primary key