Fixed NotificationQuery