added else of if agency not exist and take shortname properly