minor
minor
fix
minor
fix problem with company id