fix analytics to provide more details