Introduce a Match class to separate match handling.

Change-Id: Iab4260a348676f74ece419011a9a87a1662a09c0
Separate display filtering into a its own class too.

Change-Id: I79a2ae55ac98ad6062a2b34b124c859081dad7b5