changes to improve performance

Improve performance to analyse multiple countries