Add support for multimatch source filtering.
Remove additional dependency.
Restore default match set functionality.