rename addQuery and removeQuery commands to Subscribe and Unsubscribe