expanded entry name matching capability, refactored reporting code