Change stored event repo to use one predicate