adjusting query, wasn't capturing applicable subscriptions correctly