Attempting to cut down on the query time for the subscribes and unsubscribes, though the core filter is still big.