added support for AND query