Fix issue #35 - Links for click tracking not always properly recognized

Needs testing - will ask original reporters.