Improved key calculation of DeferredNotifier and remove index after action execution