Cleanup, enhanced event filter to filter out based on walltime

Cleanup, enhanced event filter to filter out based on walltime