Updated lookups such that they only match one event