Add counts to views; Refactor matcher logic