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