Fix and cleanup code when linking subscriptions in streams to replays

This update fixes an issue where linked subscriptions to a replay directly did not get attached