1) fix for NPE on new subscription adding
2) unnecessary map removed