Fix for AND condition of multi match query