fix #20 - now, agency mapping is based on agency id. 

available then mapping is done by agency name