Added filter and unsubscribe features