Issue 7027 - Adapted code to work with latest changes to FilterStorage.subscriptions

This MR for #219 (closed) contains the following changes:

• Access FilterStorage.subscription as a generator
• Merged loops since we're no longer dealing with an array
• Renamed non-descriptive variable "result"