Use matches in .where
Merge pull request #3331 from megawac/where

Use matches in .where