Removed unneeded comparison from NotificationItem
Split grouping queue state to it's own class