Correct handling of long ids and notification batches