LPS-42551 Change AND to OR when joining properties and content queries