diff --git a/Src/Common/Controls/XMLViews/FilterBar.cs b/Src/Common/Controls/XMLViews/FilterBar.cs
index be7c24fc6d..8113ea7276 100644
--- a/Src/Common/Controls/XMLViews/FilterBar.cs
+++ b/Src/Common/Controls/XMLViews/FilterBar.cs
@@ -969,6 +969,12 @@ protected void MakeCombo(FilterSortItem item)
 					combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksNonBlanks), new NonBlankMatcher(), item));
 					break;
 			}
+			string multipara = XmlUtils.GetOptionalAttributeValue(item.Spec, "multipara", "false");
+			if (multipara == "true")
+			{
+				combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksMoreThanOneLine), new MoreThanOneLineMatcher(), item));
+				combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksExactlyOneLine), new ExactlyOneLineMatcher(), item));
+			}
 
 			// Enhance JohnT: figure whether the column has vernacular or analysis data...
 			int ws = 0;
diff --git a/Src/Common/Controls/XMLViews/LayoutFinder.cs b/Src/Common/Controls/XMLViews/LayoutFinder.cs
index 39a8f61912..d21e016931 100644
--- a/Src/Common/Controls/XMLViews/LayoutFinder.cs
+++ b/Src/Common/Controls/XMLViews/LayoutFinder.cs
@@ -245,7 +245,7 @@ public ITsString Key(IManyOnePathSortItem item, bool fForSorting)
 			}
 			else
 			{
-				collector = new TsStringCollectorEnv(null, m_sda, hvo);
+				collector = new TsStringCollectorEnv(null, m_sda, hvo, true);
 			}
 
 			// This will check to see if the VC is either null or disposed.  The disposed check is neccesary because
diff --git a/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs b/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
index e6fb69808e..57d5f1ba44 100644
--- a/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
+++ b/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.18444
@@ -780,20 +780,44 @@ internal static string ksNoDesc {
                 return ResourceManager.GetString("ksNoDesc", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Non-blanks.
-        /// </summary>
-        internal static string ksNonBlanks {
-            get {
-                return ResourceManager.GetString("ksNonBlanks", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to (none).
-        /// </summary>
-        internal static string ksNone {
+
+		/// <summary>
+		///   Looks up a localized string similar to Non-blanks.
+		/// </summary>
+		internal static string ksNonBlanks
+		{
+			get
+			{
+				return ResourceManager.GetString("ksNonBlanks", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to Exactly one line.
+		/// </summary>
+		internal static string ksExactlyOneLine
+		{
+			get
+			{
+				return ResourceManager.GetString("ksExactlyOneLine", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to More than one line.
+		/// </summary>
+		internal static string ksMoreThanOneLine
+		{
+			get
+			{
+				return ResourceManager.GetString("ksMoreThanOneLine", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to (none).
+		/// </summary>
+		internal static string ksNone {
             get {
                 return ResourceManager.GetString("ksNone", resourceCulture);
             }
diff --git a/Src/Common/Controls/XMLViews/XMLViewsStrings.resx b/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
index 2f84f238a0..078ac29439 100644
--- a/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
+++ b/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -330,6 +330,12 @@ Change the writing system of one of these columns or remove the duplicated colum
   <data name="ksNonBlanks" xml:space="preserve">
     <value>Non-blanks</value>
   </data>
+  <data name="ksMoreThanOneLine" xml:space="preserve">
+    <value>More than one line</value>
+  </data>
+  <data name="ksExactlyOneLine" xml:space="preserve">
+    <value>Exactly one line</value>
+  </data>
   <data name="ksNone" xml:space="preserve">
     <value>(none)</value>
   </data>
diff --git a/Src/Common/Filters/RecordFilter.cs b/Src/Common/Filters/RecordFilter.cs
index 40830e6ab4..5d7da342a9 100644
--- a/Src/Common/Filters/RecordFilter.cs
+++ b/Src/Common/Filters/RecordFilter.cs
@@ -1341,6 +1341,7 @@ public override bool Matches(ITsString arg)
 			}
 			return false;
 		}
+
 		/// <summary>
 		/// True if it is the same class and member vars match.
 		/// </summary>
@@ -1352,6 +1353,65 @@ public override bool SameMatcher(IMatcher other)
 		}
 	}
 
+	/// <summary>
+	/// Matches entries with more than one line.
+	/// </summary>
+	public class MoreThanOneLineMatcher : BaseMatcher
+	{
+		/// ------------------------------------------------------------------------------------
+		/// <summary>
+		/// Contains a new line.
+		/// </summary>
+		/// <param name="arg"></param>
+		/// <returns></returns>
+		/// ------------------------------------------------------------------------------------
+		public override bool Matches(ITsString arg)
+		{
+			if (arg == null || arg.Length == 0)
+				return false;
+			return arg.Text.Contains("\r");
+		}
+
+		/// <summary>
+		/// True if it is the same class and member vars match.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
+		public override bool SameMatcher(IMatcher other)
+		{
+			return other is MoreThanOneLineMatcher;
+		}
+	}
+
+	/// <summary>
+	/// Matches entries with exactly one line.
+	/// </summary>
+	public class ExactlyOneLineMatcher : BaseMatcher
+	{
+		/// ------------------------------------------------------------------------------------
+		/// <summary>
+		/// Does not contain a new line and is not empty.
+		/// </summary>
+		/// <param name="arg"></param>
+		/// <returns></returns>
+		/// ------------------------------------------------------------------------------------
+		public override bool Matches(ITsString arg)
+		{
+			if (arg == null || arg.Length == 0)
+				return false;
+			return !arg.Text.Contains("\r");
+		}
+		/// <summary>
+		/// True if it is the same class and member vars match.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
+		public override bool SameMatcher(IMatcher other)
+		{
+			return other is ExactlyOneLineMatcher;
+		}
+	}
+
 	/// <summary>
 	/// Matches if the embedded matcher fails.
 	/// </summary>
diff --git a/Src/Common/RootSite/CollectorEnv.cs b/Src/Common/RootSite/CollectorEnv.cs
index 3a719844a7..deb7f3aa70 100644
--- a/Src/Common/RootSite/CollectorEnv.cs
+++ b/Src/Common/RootSite/CollectorEnv.cs
@@ -2893,6 +2893,7 @@ public class TsStringCollectorEnv : CollectorEnv
 		private ITsIncStrBldr m_builder;
 		private bool m_fNewParagraph = false;
 		private int m_cParaOpened = 0;
+		private bool m_addEOL = false;
 
 		/// ------------------------------------------------------------------------------------
 		/// <summary>
@@ -2902,8 +2903,9 @@ public class TsStringCollectorEnv : CollectorEnv
 		/// <param name="sda">Date access to get prop values etc.</param>
 		/// <param name="hvoRoot">The root object to display, if m_baseEnv is null.
 		/// If baseEnv is not null, hvoRoot is ignored.</param>
+		/// <param name="addEOL">Add an EOL between lines.</param>
 		/// ------------------------------------------------------------------------------------
-		public TsStringCollectorEnv(IVwEnv baseEnv, ISilDataAccess sda, int hvoRoot):
+		public TsStringCollectorEnv(IVwEnv baseEnv, ISilDataAccess sda, int hvoRoot, bool addEOL = false) :
 			base(baseEnv, sda, hvoRoot)
 		{
 			m_builder = TsStringUtils.MakeIncStrBldr();
@@ -2911,6 +2913,7 @@ public TsStringCollectorEnv(IVwEnv baseEnv, ISilDataAccess sda, int hvoRoot):
 			// builders by giving it SOME writing system.
 			m_builder.SetIntPropValues((int)FwTextPropType.ktptWs, (int)FwTextPropVar.ktpvDefault,
 				sda.WritingSystemFactory.UserWs);
+			this.m_addEOL = addEOL;
 		}
 
 		/// ------------------------------------------------------------------------------------
@@ -2921,6 +2924,11 @@ public TsStringCollectorEnv(IVwEnv baseEnv, ISilDataAccess sda, int hvoRoot):
 		/// ------------------------------------------------------------------------------------
 		public override void AddTsString(ITsString tss)
 		{
+			if (m_addEOL && m_builder.Text != null)
+			{
+				// Allow MoreThanOneLineMatcher and ExactlyOneLineMatcher to distinguish lines.
+				m_builder.Append("\r");
+			}
 			AppendSpaceForFirstWordInNewParagraph(tss.Text);
 			m_builder.AppendTsString(tss);
 		}
@@ -2933,6 +2941,11 @@ public override void AddTsString(ITsString tss)
 		/// ------------------------------------------------------------------------------------
 		internal protected override void AddResultString(string s)
 		{
+			if (m_addEOL && m_builder.Text != null)
+			{
+				// Allow MoreThanOneLineMatcher and ExactlyOneLineMatcher to distinguish lines.
+				m_builder.Append("\r");
+			}
 			AppendSpaceForFirstWordInNewParagraph(s);
 			m_builder.Append(s);
 		}