diff --git a/PROMS/DataLoader/PROMSFixes.Sql b/PROMS/DataLoader/PROMSFixes.Sql
index 847dcdf2..404992ff 100644
--- a/PROMS/DataLoader/PROMSFixes.Sql
+++ b/PROMS/DataLoader/PROMSFixes.Sql
@@ -1534,7 +1534,7 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_SiblingAndC
 GO
 
 /*
-select * from vefn_SiblingAndChildrenItems('','3-') 
+select * from vefn_SiblingAndChildrenItems('146','') 
 */
 
 /*****************************************************************************
@@ -2009,42 +2009,158 @@ exec vesp_SearchItemAndChildrenNew  '','','PORV NEAR SG',2,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','CHECK NORMAL',0,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','(Resolved Transition Text)',0,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','%turbine-driven%',0,0,0,0
+exec vesp_SearchItemAndChildrenNew  '37','','rcp',0,0,0,0,'3-' -- Wolf Creek sample
 */
 
 /*****************************************************************************
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+       Copyright 2019 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
 CREATE PROCEDURE [dbo].[vesp_SearchItemAndChildrenNew] (@DocVersionList varchar(MAX), @StepTypeList varchar(MAX),
 @SearchString varchar(MAX), @CaseSensitive as int, @IncludeLinks as int, @IncludeRtfFormatting as int, @IncludeSpecialCharacters as int, @UnitPrefix as varchar(MAX))
 WITH EXECUTE AS OWNER
 AS
-select ZZ.DvPath, ZZ.Path, ZZ.[Level],ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
-		,II.[LastChanged]
-	  ,CC.[Number],CC.[Text],CC.[Type],CC.[FormatID],CC.[Config],CC.[DTS] [cDTS],CC.[UserID] [cUserID]
-		,CC.[LastChanged] [cLastChanged],
-		PP.[ContentID] [pContentID], PP.[DTS] [pDTS],PP.[UserID] [pUserID], PP.[LastChanged] [pLastChanged],
+Set @SearchString = .dbo.vefn_FixSearchString(@SearchString)
+Declare @SearchStringx nvarchar(200)  --kbr
+set @SearchStringx = replace(@SearchString,'\u8209?','-') --JSJ B2016-209 not finding dashes in Word sections (FixSearchString converts '-' to '\u8209?')
+if (@IncludeLinks + @IncludeRtfFormatting + @IncludeSpecialCharacters = 0)
+begin
+if (@CaseSensitive = 0) 
+Begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
 		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
 		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
 		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
 		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
 		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
 		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
-		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=CC.[ContentID]) [DetailCount],
-		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=CC.[ContentID]) [EntryCount],
-		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=CC.[ContentID]) [GridCount],
-		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=CC.[ContentID]) [ImageCount],
-		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=CC.[ContentID]) [ItemCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=CC.[ContentID]) [cPartCount],
-		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=CC.[ContentID]) [RoUsageCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=CC.[ContentID]) [TransitionCount],
-		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=CC.[ContentID]) [ZContentCount]
-from vefn_SiblingAndChildrenItems(@DocVersionList, @UnitPrefix) ZZ
-  Join Items II on ZZ.ItemID=II.ItemID
-  Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
-  Join Contents CC on CC.ContentID=ZZ.ContentID
-where  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
- order by DvPath,OrdinalPath
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+ order by DvPath
+ end
+ else
+ begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+where zz.text Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+zz.text Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx
+ order by DvPath
+ end
+ end -- no links
+ else
+begin -- include linked text
+if (@CaseSensitive = 0) 
+Begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+where .dbo.vefn_RemoveExtraText(zz.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchString or 
+.dbo.vefn_RemoveExtraText(zz.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchStringx or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CI_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CI_AS like @SearchStringx
+ order by DvPath
+ end
+ else -- case sensitive
+ begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+--
+where .dbo.vefn_RemoveExtraText(replace(zz.Text,'\''b0', '\''B0'),@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like replace(@SearchString,'\''b0', '\''B0') or 
+.dbo.vefn_RemoveExtraText(replace(zz.Text,'\''b0', '\''B0'),@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like replace(@SearchStringx,'\''b0', '\''B0') or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx
+ order by DvPath
+ end
+ end -- include links
  GO
 IF (@@Error = 0) PRINT 'Procedure Creation: vesp_SearchItemAndChildrenNew Succeeded'
 ELSE PRINT 'Procedure Creation: vesp_SearchItemAndChildrenNew Error on Creation'
@@ -14976,6 +15092,143 @@ IF (@@Error = 0) PRINT 'Procedure Creation: vesp_UpdateVersionFormatForUCF Succe
 ELSE PRINT 'Procedure Creation: vesp_UpdateVersionFormatForUCF Error on Creation'
 GO
 
+/****** Object:  Table Function [vefn_SiblingAndChildrenItemsNew] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_SiblingAndChildrenItemsNew]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
+    DROP FUNCTION [vefn_SiblingAndChildrenItemsNew];
+GO
+/*
+select * from vefn_SiblingAndChildrenItemsNew('37','3-', '%rcp%','%rcp%','') where Text like '%rcp%'
+*/
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2019 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+Create FUNCTION [dbo].[vefn_SiblingAndChildrenItemsNew](@DocVersionList varchar(MAX),@UnitPrefix varchar(MAX),@SearchString varchar(MAX),@SearchStringx varchar(MAX), @StepTypeList varchar(MAX))
+RETURNS @SiblingAndChildren TABLE
+(
+		[ILastChanged] varbinary(8)
+	,	[ItemID] int PRIMARY KEY
+	, [DVPath] nvarchar(max)
+	, [Path] nvarchar(max)
+	, [FromType] int
+	, [Ordinal] int
+	, [ParentID] int
+	, [PreviousID] int
+	, [ContentID] int
+	, [DTS] datetime
+	, [UserID] nvarchar(100)
+	, [pContentID] int
+	, [pDTS] datetime
+	, [pUserID] nvarchar(100)
+	, [IsRNO] int
+	, Text nvarchar(max)
+	, DocAscii nvarchar(max)
+	, Number nvarchar(256)
+	, CType int
+	, CFormatID int
+	, CConfig nvarchar(max)
+	, CDTS datetime
+	, CUserID nvarchar(100)
+	, CLastChanged varbinary(8)
+	, PLastChanged varbinary(8)
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN
+Declare @Delim char(1)
+Set @Delim=char(7)
+Declare @DelimNumber char(1)
+Set @DelimNumber=char(17)
+Declare @DelimStep char(1)
+Set @DelimStep='.'
+BEGIN
+with Itemz([ILastChanged], [ItemID], VersionID,[Path],  [FromType],[Ordinal], [ParentID], [PreviousID], [ContentID], [DTS], [UserID],[pContentID],
+  [pDTS],[pUserID],[IsRNO], Text, Number, PPath, CType, CFormatID, CConfig, CDTS, CUserID, CLastChanged, PLastChanged) as (
+  Select Cast(I.LastChanged as varbinary(8)) ILastChanged,[I].[ItemID], VersionID,
+	Cast(Case when C.Type < 20000 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') else '1' end as nvarchar(max)) [Path]
+	, 0 [FromType], 0 [Ordinal], 0 [ParentID], [PreviousID],[I].[ContentID],[I].[DTS],[I].[UserID]
+	,0 [pContentID],[I].[DTS] [pDTS], [I].[UserID] [pUserID],0 IsRNO, C.Text, C.Number,
+		Cast('' as nvarchar(max)) [PPath], C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(0 as varbinary(8)) PLastChanged
+	FROM [Items] I
+  Join Contents C on C.ContentID=I.ContentID
+  JOIN vefn_DocVersionSplit(@DocVersionList) DV
+    ON I.[ItemID] = DV.[ItemID]
+Union All
+-- Children
+  select Cast(I.LastChanged as varbinary(8)) ILastChanged,I.[ItemID], VersionID,	
+	Path + case C.Type/10000
+	when 0 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Procedure
+	when 1 then @Delim + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Section
+	else
+	case P.FromType
+	--when 1 then 'PRC' + @Delim + cast(1 as varchar(4))
+	--when 2 then 'SEC' + @Delim + cast(1 as varchar(4))
+	when 3 then @DelimStep +'Caution' + @DelimStep + cast(1 as varchar(4))
+	when 4 then @DelimStep +'Note' + @DelimStep + cast(1 as varchar(4))
+	when 5 then @DelimStep +'RNO' + @DelimStep
+	when 7 then @DelimStep +'Table' + @DelimStep + cast(1 as varchar(4))
+	when 8 then @DelimStep +'SupInfo' + @DelimStep
+	else case when Z.FromType < 3 then @Delim else @DelimStep end + cast(1 as varchar(4))
+	end end Path, 
+	P.[FromType],0 [Ordinal], Z.ItemID [ParentID],I.[PreviousID], I.[ContentID],I.[DTS],I.[UserID],
+	P.[ContentID] [pContentID],P.[DTS] [pDTS],P.[UserID] [pUserID],
+	  case when P.FromType = 5 then -1 else 0 end IsRNO,
+	C.Text,c.Number,
+	Path + case C.Type/10000
+	when 2 then
+	case P.FromType
+	when 3 then @DelimStep + 'Caution'
+	when 4 then @DelimStep + 'Note'
+	when 8 then @DelimStep + 'SupInfo' 
+	else '' end 
+	else '' end [PPath], C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(P.LastChanged as varbinary(8)) PLastChanged
+	from Itemz Z
+	join Parts P on P.ContentID = Z.ContentID
+	join Items I on I.ItemID = P.ItemID
+  join Contents C on C.ContentID = I.ContentID
+	Union All
+-- Siblings
+  select Cast(I.LastChanged as varbinary(8)) ILastChanged,I.[ItemID], VersionID, PPath  + case C.Type/10000
+	when 0 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Procedure
+	when 1 then @Delim + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Section
+	else case when .dbo.vefn_GetLastDelim(Path) = '.' then @DelimStep else @Delim end + cast(Ordinal + 2 as varchar(4))
+	end Path,
+	[FromType],Z.[Ordinal] +1,Z.[ParentID], I.[PreviousID], I.[ContentID],I.[DTS],I.[UserID]
+	,null,null,null,
+	 0 IsRNO,	
+	 C.Text, C.Number,
+	 PPath, C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(0 as varbinary(8)) PLastChanged
+	from Itemz Z
+	join Items I on I.PreviousID = Z.ItemID
+  join Contents C on C.ContentID = I.ContentID
+	--where Z.[Level] > 0
+)
+
+insert into @SiblingAndChildren
+select ZZ.ILastChanged,ZZ.[ItemID], dvpath, [Path],[FromType],[Ordinal], [ParentID], [PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID],
+		[pContentID],[pDTS],[pUserID],[IsRNO],Text,DocAscii, Number, CType, CFormatID, CConfig, CDTS, CUserID, CLastChanged, PLastChanged
+		From Itemz ZZ
+		join vefn_DocVersionSplit(@DocVersionList) DV ON ZZ.VersionID=zz.VersionID 
+		Left Join Entries EE ON EE.ContentID=ZZ.ContentID
+	Left Join Documents DD ON DD.DocID = ee.DocID
+	where (text like @SearchString OR Replace(DD.DocAscii,nchar(176),'\''B0') like @SearchString or text like @SearchStringx OR 
+	Replace(DD.DocAscii,nchar(176),'\''B0') like @SearchStringx )
+	and (isnull(@StepTypeList,'') = '' or (dbo.vefn_AllSections(CType) in (Select ID from vefn_SplitInt(@StepTypeList,','))))
+	OPTION (MAXRECURSION 10000)
+END
+RETURN
+END
+GO
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'TableFunction Creation: vefn_SiblingAndChildrenItemsNew Succeeded'
+ELSE PRINT 'TableFunction Creation: vefn_SiblingAndChildrenItemsNew Error on Creation'
+GO
+
+
 -----------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
@@ -15001,8 +15254,8 @@ BEGIN TRY -- Try Block
 	set nocount on
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
-	set @RevDate = '04/23/2019 01:50 PM'
-	set @RevDescription = 'Case Sensitive Search Fix'
+	set @RevDate = '12/11/2019 02:26 PM'
+	set @RevDescription = 'Text Search Performance Improvement'
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
 	IF( @@TRANCOUNT > 0 ) COMMIT
diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql
index 847dcdf2..404992ff 100644
--- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql	
+++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql	
@@ -1534,7 +1534,7 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_SiblingAndC
 GO
 
 /*
-select * from vefn_SiblingAndChildrenItems('','3-') 
+select * from vefn_SiblingAndChildrenItems('146','') 
 */
 
 /*****************************************************************************
@@ -2009,42 +2009,158 @@ exec vesp_SearchItemAndChildrenNew  '','','PORV NEAR SG',2,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','CHECK NORMAL',0,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','(Resolved Transition Text)',0,0,0,0
 exec vesp_SearchItemAndChildrenNew  '','','%turbine-driven%',0,0,0,0
+exec vesp_SearchItemAndChildrenNew  '37','','rcp',0,0,0,0,'3-' -- Wolf Creek sample
 */
 
 /*****************************************************************************
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+       Copyright 2019 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
 CREATE PROCEDURE [dbo].[vesp_SearchItemAndChildrenNew] (@DocVersionList varchar(MAX), @StepTypeList varchar(MAX),
 @SearchString varchar(MAX), @CaseSensitive as int, @IncludeLinks as int, @IncludeRtfFormatting as int, @IncludeSpecialCharacters as int, @UnitPrefix as varchar(MAX))
 WITH EXECUTE AS OWNER
 AS
-select ZZ.DvPath, ZZ.Path, ZZ.[Level],ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
-		,II.[LastChanged]
-	  ,CC.[Number],CC.[Text],CC.[Type],CC.[FormatID],CC.[Config],CC.[DTS] [cDTS],CC.[UserID] [cUserID]
-		,CC.[LastChanged] [cLastChanged],
-		PP.[ContentID] [pContentID], PP.[DTS] [pDTS],PP.[UserID] [pUserID], PP.[LastChanged] [pLastChanged],
+Set @SearchString = .dbo.vefn_FixSearchString(@SearchString)
+Declare @SearchStringx nvarchar(200)  --kbr
+set @SearchStringx = replace(@SearchString,'\u8209?','-') --JSJ B2016-209 not finding dashes in Word sections (FixSearchString converts '-' to '\u8209?')
+if (@IncludeLinks + @IncludeRtfFormatting + @IncludeSpecialCharacters = 0)
+begin
+if (@CaseSensitive = 0) 
+Begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
 		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
 		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
 		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
 		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
 		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
 		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
-		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=CC.[ContentID]) [DetailCount],
-		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=CC.[ContentID]) [EntryCount],
-		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=CC.[ContentID]) [GridCount],
-		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=CC.[ContentID]) [ImageCount],
-		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=CC.[ContentID]) [ItemCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=CC.[ContentID]) [cPartCount],
-		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=CC.[ContentID]) [RoUsageCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=CC.[ContentID]) [TransitionCount],
-		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=CC.[ContentID]) [ZContentCount]
-from vefn_SiblingAndChildrenItems(@DocVersionList, @UnitPrefix) ZZ
-  Join Items II on ZZ.ItemID=II.ItemID
-  Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
-  Join Contents CC on CC.ContentID=ZZ.ContentID
-where  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
- order by DvPath,OrdinalPath
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+ order by DvPath
+ end
+ else
+ begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+where zz.text Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+zz.text Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx
+ order by DvPath
+ end
+ end -- no links
+ else
+begin -- include linked text
+if (@CaseSensitive = 0) 
+Begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+where .dbo.vefn_RemoveExtraText(zz.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchString or 
+.dbo.vefn_RemoveExtraText(zz.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CI_AS like @SearchStringx or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CI_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CI_AS like @SearchStringx
+ order by DvPath
+ end
+ else -- case sensitive
+ begin
+	select ZZ.DvPath, ZZ.Path, ZZ.[FromType],ZZ.[Ordinal], ZZ.[ParentID], ZZ.[ItemID],ZZ.[PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID]
+		,ZZ.[ILastChanged]
+	  ,ZZ.[Number],ZZ.[Text],ZZ.[CType] [Type],ZZ.[CFormatID] [FormatID],ZZ.[CConfig] [Config],ZZ.[CDTS] ,ZZ.[CUserID] 
+		,ZZ.[cLastChanged],
+		zz.[pContentID], ZZ.[pDTS],ZZ.[pUserID], ZZ.[pLastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=ZZ.[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=ZZ.[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Next] WHERE [Next].[PreviousID]=ZZ.[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=ZZ.[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=ZZ.[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=ZZ.[ItemID]) [Transition_ToIDCount],
+		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=ZZ.[ContentID]) [DetailCount],
+		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=ZZ.[ContentID]) [EntryCount],
+		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=ZZ.[ContentID]) [GridCount],
+		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=ZZ.[ContentID]) [ImageCount],
+		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=ZZ.[ContentID]) [ItemCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=ZZ.[ContentID]) [cPartCount],
+		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=ZZ.[ContentID]) [RoUsageCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=ZZ.[ContentID]) [TransitionCount],
+		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=ZZ.[ContentID]) [ZContentCount]
+from vefn_SiblingAndChildrenItemsNew(@DocVersionList, @UnitPrefix, @SearchString, @SearchStringx,@StepTypeList) ZZ
+  --Join Items II on ZZ.ItemID=II.ItemID
+  --Left Join Parts PP on ZZ.PContentID=PP.ContentID and ZZ.FromType = PP.FromType
+  --Join Contents CC on CC.ContentID=ZZ.ContentID
+--where ZZ.Text like @SearchString or zz.text like @SearchStringx--  ZZ.ContentID in (select ContentID from vefn_FindText(@DocVersionList,@SearchString,@CaseSensitive,@IncludeLinks,@IncludeRtfFormatting,@IncludeSpecialCharacters,@StepTypeList))
+--
+where .dbo.vefn_RemoveExtraText(replace(zz.Text,'\''b0', '\''B0'),@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like replace(@SearchString,'\''b0', '\''B0') or 
+.dbo.vefn_RemoveExtraText(replace(zz.Text,'\''b0', '\''B0'),@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) Collate SQL_Latin1_General_CP1_CS_AS like replace(@SearchStringx,'\''b0', '\''B0') or
+-- docascii are the word sections
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchString or 
+Replace(zz.DocAscii,nchar(176),'\''B0') Collate SQL_Latin1_General_CP1_CS_AS like @SearchStringx
+ order by DvPath
+ end
+ end -- include links
  GO
 IF (@@Error = 0) PRINT 'Procedure Creation: vesp_SearchItemAndChildrenNew Succeeded'
 ELSE PRINT 'Procedure Creation: vesp_SearchItemAndChildrenNew Error on Creation'
@@ -14976,6 +15092,143 @@ IF (@@Error = 0) PRINT 'Procedure Creation: vesp_UpdateVersionFormatForUCF Succe
 ELSE PRINT 'Procedure Creation: vesp_UpdateVersionFormatForUCF Error on Creation'
 GO
 
+/****** Object:  Table Function [vefn_SiblingAndChildrenItemsNew] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_SiblingAndChildrenItemsNew]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
+    DROP FUNCTION [vefn_SiblingAndChildrenItemsNew];
+GO
+/*
+select * from vefn_SiblingAndChildrenItemsNew('37','3-', '%rcp%','%rcp%','') where Text like '%rcp%'
+*/
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2019 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+Create FUNCTION [dbo].[vefn_SiblingAndChildrenItemsNew](@DocVersionList varchar(MAX),@UnitPrefix varchar(MAX),@SearchString varchar(MAX),@SearchStringx varchar(MAX), @StepTypeList varchar(MAX))
+RETURNS @SiblingAndChildren TABLE
+(
+		[ILastChanged] varbinary(8)
+	,	[ItemID] int PRIMARY KEY
+	, [DVPath] nvarchar(max)
+	, [Path] nvarchar(max)
+	, [FromType] int
+	, [Ordinal] int
+	, [ParentID] int
+	, [PreviousID] int
+	, [ContentID] int
+	, [DTS] datetime
+	, [UserID] nvarchar(100)
+	, [pContentID] int
+	, [pDTS] datetime
+	, [pUserID] nvarchar(100)
+	, [IsRNO] int
+	, Text nvarchar(max)
+	, DocAscii nvarchar(max)
+	, Number nvarchar(256)
+	, CType int
+	, CFormatID int
+	, CConfig nvarchar(max)
+	, CDTS datetime
+	, CUserID nvarchar(100)
+	, CLastChanged varbinary(8)
+	, PLastChanged varbinary(8)
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN
+Declare @Delim char(1)
+Set @Delim=char(7)
+Declare @DelimNumber char(1)
+Set @DelimNumber=char(17)
+Declare @DelimStep char(1)
+Set @DelimStep='.'
+BEGIN
+with Itemz([ILastChanged], [ItemID], VersionID,[Path],  [FromType],[Ordinal], [ParentID], [PreviousID], [ContentID], [DTS], [UserID],[pContentID],
+  [pDTS],[pUserID],[IsRNO], Text, Number, PPath, CType, CFormatID, CConfig, CDTS, CUserID, CLastChanged, PLastChanged) as (
+  Select Cast(I.LastChanged as varbinary(8)) ILastChanged,[I].[ItemID], VersionID,
+	Cast(Case when C.Type < 20000 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') else '1' end as nvarchar(max)) [Path]
+	, 0 [FromType], 0 [Ordinal], 0 [ParentID], [PreviousID],[I].[ContentID],[I].[DTS],[I].[UserID]
+	,0 [pContentID],[I].[DTS] [pDTS], [I].[UserID] [pUserID],0 IsRNO, C.Text, C.Number,
+		Cast('' as nvarchar(max)) [PPath], C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(0 as varbinary(8)) PLastChanged
+	FROM [Items] I
+  Join Contents C on C.ContentID=I.ContentID
+  JOIN vefn_DocVersionSplit(@DocVersionList) DV
+    ON I.[ItemID] = DV.[ItemID]
+Union All
+-- Children
+  select Cast(I.LastChanged as varbinary(8)) ILastChanged,I.[ItemID], VersionID,	
+	Path + case C.Type/10000
+	when 0 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Procedure
+	when 1 then @Delim + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Section
+	else
+	case P.FromType
+	--when 1 then 'PRC' + @Delim + cast(1 as varchar(4))
+	--when 2 then 'SEC' + @Delim + cast(1 as varchar(4))
+	when 3 then @DelimStep +'Caution' + @DelimStep + cast(1 as varchar(4))
+	when 4 then @DelimStep +'Note' + @DelimStep + cast(1 as varchar(4))
+	when 5 then @DelimStep +'RNO' + @DelimStep
+	when 7 then @DelimStep +'Table' + @DelimStep + cast(1 as varchar(4))
+	when 8 then @DelimStep +'SupInfo' + @DelimStep
+	else case when Z.FromType < 3 then @Delim else @DelimStep end + cast(1 as varchar(4))
+	end end Path, 
+	P.[FromType],0 [Ordinal], Z.ItemID [ParentID],I.[PreviousID], I.[ContentID],I.[DTS],I.[UserID],
+	P.[ContentID] [pContentID],P.[DTS] [pDTS],P.[UserID] [pUserID],
+	  case when P.FromType = 5 then -1 else 0 end IsRNO,
+	C.Text,c.Number,
+	Path + case C.Type/10000
+	when 2 then
+	case P.FromType
+	when 3 then @DelimStep + 'Caution'
+	when 4 then @DelimStep + 'Note'
+	when 8 then @DelimStep + 'SupInfo' 
+	else '' end 
+	else '' end [PPath], C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(P.LastChanged as varbinary(8)) PLastChanged
+	from Itemz Z
+	join Parts P on P.ContentID = Z.ContentID
+	join Items I on I.ItemID = P.ItemID
+  join Contents C on C.ContentID = I.ContentID
+	Union All
+-- Siblings
+  select Cast(I.LastChanged as varbinary(8)) ILastChanged,I.[ItemID], VersionID, PPath  + case C.Type/10000
+	when 0 then @Delim + @UnitPrefix + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Procedure
+	when 1 then @Delim + Isnull(C.Number,'') + @DelimNumber + Isnull(C.Text,'') -- Section
+	else case when .dbo.vefn_GetLastDelim(Path) = '.' then @DelimStep else @Delim end + cast(Ordinal + 2 as varchar(4))
+	end Path,
+	[FromType],Z.[Ordinal] +1,Z.[ParentID], I.[PreviousID], I.[ContentID],I.[DTS],I.[UserID]
+	,null,null,null,
+	 0 IsRNO,	
+	 C.Text, C.Number,
+	 PPath, C.Type CType, C.FormatID CFormatID, C.Config CConfig, C.Dts CDTS,C.UserID CUSERID,
+		Cast(C.LastChanged as varbinary(8)) CLastChanged, Cast(0 as varbinary(8)) PLastChanged
+	from Itemz Z
+	join Items I on I.PreviousID = Z.ItemID
+  join Contents C on C.ContentID = I.ContentID
+	--where Z.[Level] > 0
+)
+
+insert into @SiblingAndChildren
+select ZZ.ILastChanged,ZZ.[ItemID], dvpath, [Path],[FromType],[Ordinal], [ParentID], [PreviousID],ZZ.[ContentID],ZZ.[DTS],ZZ.[UserID],
+		[pContentID],[pDTS],[pUserID],[IsRNO],Text,DocAscii, Number, CType, CFormatID, CConfig, CDTS, CUserID, CLastChanged, PLastChanged
+		From Itemz ZZ
+		join vefn_DocVersionSplit(@DocVersionList) DV ON ZZ.VersionID=zz.VersionID 
+		Left Join Entries EE ON EE.ContentID=ZZ.ContentID
+	Left Join Documents DD ON DD.DocID = ee.DocID
+	where (text like @SearchString OR Replace(DD.DocAscii,nchar(176),'\''B0') like @SearchString or text like @SearchStringx OR 
+	Replace(DD.DocAscii,nchar(176),'\''B0') like @SearchStringx )
+	and (isnull(@StepTypeList,'') = '' or (dbo.vefn_AllSections(CType) in (Select ID from vefn_SplitInt(@StepTypeList,','))))
+	OPTION (MAXRECURSION 10000)
+END
+RETURN
+END
+GO
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'TableFunction Creation: vefn_SiblingAndChildrenItemsNew Succeeded'
+ELSE PRINT 'TableFunction Creation: vefn_SiblingAndChildrenItemsNew Error on Creation'
+GO
+
+
 -----------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
@@ -15001,8 +15254,8 @@ BEGIN TRY -- Try Block
 	set nocount on
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
-	set @RevDate = '04/23/2019 01:50 PM'
-	set @RevDescription = 'Case Sensitive Search Fix'
+	set @RevDate = '12/11/2019 02:26 PM'
+	set @RevDescription = 'Text Search Performance Improvement'
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
 	IF( @@TRANCOUNT > 0 ) COMMIT