revise subscription queries to look for subscription IDs instead of primary key IDS