Refactor country details controller to flatten promise chains