fix #20 - now, agency mapping is based on agency id. If the id is not
available then mapping is done by agency name