Improve Activity duration matcher (fixup)