Updated EventSearch and ActiveOnSteroids