V3

I'm fine with you doing `!wasInQuery` here if you want.