distinguish multiple address
with date range selection
some final clean up