Use matches in .where

Agreed, I'd say it makes more sense with own props