Adds ability to match disabled attrs on stream and type
Now matches all possible attributes to prevent invalid cleanup

Was previously removing the stream entry but a valid Listener 
attribute remained in the db.