making badge shortname detection a little better