added required dependencies
unsubscription
unsubscription fix
recognition of subscriptions with same parameters
query cleanup