Some changes to merging based on names being surrogates; Fixed bug in taxon page metrics