Use matches in .where

Matches isn't meant to be used with inherited props, I think this'll be fine