Use matches in .where

ps this is breaking in the sense of iterating own instead of in props