Make push notifications work better and make a link between queued notification and on-site notification using the timestamp