Fix bug in query match + lookup directive now has a willpick event