Smarter auto-subscriptions. #283
Name fixed. #283