cleaned dashboard event code, preserve filtering across packages