fix form and company on feature/show