Fixed repeated sort fn
Added more checks in add_owner for companies