Add filters
Refactor inexact match