Merge branch 'hotfix/company_name'
ocurrence_id fixed and minor improvements.
Merge branch 'hotfix/recommendation_improvement' into develop