Break out click listener class and make duplicate scans always result in new entry...