fix unresolved refs in subscription and notification mappings