added support for multi-match