Some small adaptations to analytics viewer after merging of the security layer