Fix existing subscription lookup