Modify(Fix) Logic bugs in Notification consumer