fix unsubscribe feature
better class name for template stuff