added option to include system fields to entries and count