added support for AND/OR matching