Misc fixes and privde admin method to upgrade user to country editor from user profile
Fix user subscription bug where country filter not applied