Fix login notifications
Fix grouping of history data