refactor upcoming events response to remove excess if filter
refactor upcoming events response to remove excess if filter

houhoulis/ReadyResponder,ReadyResponder/ReadyResponder,dusty-wil/ReadyResponder,ReadyResponder/ReadyResponder,kgf/lims,houhoulis/ReadyResponder,dusty-wil/ReadyResponder,dusty-wil/ReadyResponder,kgf/lims,houhoulis/ReadyResponder,ReadyResponder/ReadyResponder,kgf/lims,ReadyResponder/ReadyResponder,dusty-wil/ReadyResponder,houhoulis/ReadyResponder,kgf/lims