Added limit to criteria

Some prep-work for the event viewer.