Change statistic script to consider both name and addresses