More readily find short strings for links

Instead of only searching for the short string plus a space, look for
the short string followed by any non-alphanumeric character.