improvements to country and indicator activities