modify handling of analytical entries
Merge branch 'analytics' into develop