Move competition source event filtering into calculator