fixed subscribing behaviour
fixed templating