diff --git a/DistFiles/Language Explorer/Configuration/Parts/LexEntryParts.xml b/DistFiles/Language Explorer/Configuration/Parts/LexEntryParts.xml
index acf75f25e3..e530a012d3 100644
--- a/DistFiles/Language Explorer/Configuration/Parts/LexEntryParts.xml	
+++ b/DistFiles/Language Explorer/Configuration/Parts/LexEntryParts.xml	
@@ -364,14 +364,13 @@
 			<seq field="PublishIn" layout="Name" />
 		</part>
 		<part id="LexEntry-Jt-InflectionClassForAffix" type="jtview">
-			<obj field="LexemeForm" layout="InflectionClassForLexemeForm"/>
-			<seq field="AlternateForms" layout="InflectionClassForAffix"/>
+			<seq field="AllAllomorphs" layout="InflectionClassForAffix"/>
 		</part>
         <part id="LexEntry-Jt-RequiredFeaturesForLexemeForm" type="JtView">
           <obj field="LexemeForm" layout="RequiredFeatures"/>
         </part>
 		<part id="LexEntry-Jt-RequiredFeatures" type="JtView">
-			<seq field="AlternateForms" layout="RequiredFeatures"/>
+            <seq field="AllAllomorphs" layout="RequiredFeatures"/>
 		</part>
 		<part id="LexEntry-Jt-HomographNumberForEntry" type="jtview">
 			<int field="HomographNumber"/>
diff --git a/DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml b/DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml
index 4919ad077e..6e79c63fe0 100644
--- a/DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml	
+++ b/DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml	
@@ -358,30 +358,54 @@
 			<obj field="MorphType" layout="SimpleName"/>
 		</part>
 		<part id="MoForm-Jt-Environments" type="JtView">
-			<ifnot is="MoAffixProcess">
-				<seq field="PhoneEnv" layout="StringRepresentation"/>
-			</ifnot>
-		</part>
+            <!-- Must always have exactly one value for allomorph columns to align properly. -->
+            <ifnot is="MoAffixProcess">
+                <para>
+                    <seq field="InflectionClasses" layout="Name" sep="; "/>
+                </para>
+            </ifnot>
+            <if is="MoAffixProcess">
+                <lit>n/a</lit>
+            </if>
+        </part>
 		<part id="MoForm-Jt-InflectionClassForLexemeForm" type="JtView">
+            <!-- Must always have exactly one value for allomorph columns to align properly. -->
 			<if is="MoAffixForm">
-				<seq field="InflectionClasses" layout="Name"/>
+                <para>
+                    <seq field="InflectionClasses" layout="Name" sep="; "/>
+                </para>
 			</if>
 			<ifnot is="MoAffixForm">
 				<lit>n/a</lit>
 			</ifnot>
 		</part>
 		<part id="MoForm-Jt-InflectionClassForAffix" type="JtView">
+            <!-- Must always have exactly one value for allomorph columns to align properly. -->
 			<if is="MoAffixForm">
-				<seq field="InflectionClasses" layout="Name"/>
+                <para>
+                    <seq field="InflectionClasses" layout="Name" sep="; "/>
+                </para>
 			</if>
-		</part>
+            <ifnot is="MoAffixForm">
+                <lit>n/a</lit>
+            </ifnot>
+        </part>
 		<part id="MoForm-Jt-RequiredFeatures" type="JtView">
+            <!-- Must always have exactly one value for allomorph columns to align properly. -->
 			<if is="MoAffixAllomorph">
-                <obj field="MsEnvFeatures" layout="empty">
-                  <string field="LongNameTSS"/>
-                </obj>
-			</if>
-		</part>
+                <ifnot field="MsEnvFeatures" hvoequals="0">
+                    <obj field="MsEnvFeatures" layout="empty">
+                        <string field="LongNameTSS"/>
+                    </obj>
+                </ifnot>
+                <if field="MsEnvFeatures" hvoequals="0">
+                    <lit></lit>
+                </if>
+            </if>
+            <ifnot is="MoAffixAllomorph">
+                <lit>n/a</lit>
+            </ifnot>
+        </part>
 		<part id="MoForm-Jt-SimpleForm" type="JtView">
 			<string field="Form" ws="vernacular"/>
 		</part>
diff --git a/Src/Common/Controls/XMLViews/XmlVc.cs b/Src/Common/Controls/XMLViews/XmlVc.cs
index f1a7ace8aa..2a7ddb3f02 100644
--- a/Src/Common/Controls/XMLViews/XmlVc.cs
+++ b/Src/Common/Controls/XMLViews/XmlVc.cs
@@ -3541,7 +3541,8 @@ static private bool HvoEqualsConditionPasses(IVwEnv vwenv, XmlNode frag, int hvo
 				if (val == hvoParent)
 					return true;
 			}
-			return false;
+			// e.g. sHvo = "0"
+			return sHvo.Equals(val.ToString());
 		}
 
 		/// <summary>