Uncouple interagencyservice from currentuserservice and remove dimension contraint for country users