diff --git a/base/src/org/compiere/report/FinReport.java b/base/src/org/compiere/report/FinReport.java
index e1f6144171..b059fe55f3 100644
--- a/base/src/org/compiere/report/FinReport.java
+++ b/base/src/org/compiere/report/FinReport.java
@@ -401,42 +401,7 @@ public class FinReport extends SvrProcess
 			}
 			
 			if (m_columns[col].isColumnTypeSegmentValue())
-			{
-				String elementType = m_columns[col].getElementType();
-				if (MReportColumn.ELEMENTTYPE_Organization.equals(elementType))
-					select.append(" AND AD_Org_ID=").append(m_columns[col].getOrg_ID());
-				else if (MReportColumn.ELEMENTTYPE_BPartner.equals(elementType))
-					select.append(" AND C_BPartner_ID=").append(m_columns[col].getC_BPartner_ID());
-				else if (MReportColumn.ELEMENTTYPE_Product.equals(elementType))
-					select.append(" AND M_Product_ID=").append(m_columns[col].getM_Product_ID());
-				else if (MReportColumn.ELEMENTTYPE_Project.equals(elementType))
-					select.append(" AND C_Project_ID=").append(m_columns[col].getC_Project_ID());
-				else if (MReportColumn.ELEMENTTYPE_Activity.equals(elementType))
-					select.append(" AND C_Activity_ID=").append(m_columns[col].getC_Activity_ID());
-				else if (MReportColumn.ELEMENTTYPE_Campaign.equals(elementType))
-					select.append(" AND C_Campaign_ID=").append(m_columns[col].getC_Campaign_ID());
-				else if (MReportColumn.ELEMENTTYPE_LocationFrom.equals(elementType))
-					select.append(" AND C_LocFrom_ID=").append(m_columns[col].getC_Location_ID());
-				else if (MReportColumn.ELEMENTTYPE_LocationTo.equals(elementType))
-					select.append(" AND C_LocTo_ID=").append(m_columns[col].getC_Location_ID());
-				else if (MReportColumn.ELEMENTTYPE_OrgTrx.equals(elementType))
-					select.append(" AND AD_OrgTrx_ID=").append(m_columns[col].getOrg_ID());
-				else if (MReportColumn.ELEMENTTYPE_SalesRegion.equals(elementType))
-					select.append(" AND C_SalesRegion_ID=").append(m_columns[col].getC_SalesRegion_ID());
-				else if (MReportColumn.ELEMENTTYPE_Account.equals(elementType))
-					select.append(" AND Account_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserList1.equals(elementType))
-					select.append(" AND User1_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserList2.equals(elementType))
-					select.append(" AND User2_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserElement1.equals(elementType))
-					select.append(" AND UserElement1_ID=").append(m_columns[col].getUserElement1_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserElement2.equals(elementType))
-					select.append(" AND UserElement2_ID=").append(m_columns[col].getUserElement2_ID());
-				// Financial Report Source with Type Combination
-				else if (MReportColumn.ELEMENTTYPE_Combination.equals(elementType))
-					select.append(getWhereCombination(m_columns[col]));
-			}
+				select.append(m_columns[col].getWhereClause(p_PA_Hierarchy_ID));
 			
 			//	Parameter Where
 			select.append(m_parameterWhere);
@@ -464,117 +429,7 @@ public class FinReport extends SvrProcess
 		}
 	}	//	insertLine
 
-	/**************************************************************************
-	 *  Returns where clause for combination type
-	 *  @param reportColumn
-	 *  @return where clause for the combination
-	 */
-	private String getWhereCombination(MReportColumn reportColumn) {
-		StringBuffer whcomb = new StringBuffer();
-		// Just one org - selected owning - OrgTrx not supported in combination
-		if (reportColumn.isIncludeNullsOrg())
-			if (reportColumn.getOrg_ID() > 0)
-				whcomb.append(" AND (AD_Org_ID IS NULL OR AD_Org_ID=").append(reportColumn.getOrg_ID()).append(")");
-			else
-				whcomb.append(" AND AD_Org_ID IS NULL");
-		else
-			if (reportColumn.getOrg_ID() > 0)
-				whcomb.append(" AND AD_Org_ID=").append(reportColumn.getOrg_ID());
-		
-		if (reportColumn.isIncludeNullsBPartner())
-			if (reportColumn.getC_BPartner_ID() > 0)
-				whcomb.append(" AND (C_BPartner_ID IS NULL OR C_BPartner_ID=").append(reportColumn.getC_BPartner_ID()).append(")");
-			else
-				whcomb.append(" AND C_BPartner_ID IS NULL");
-		else
-			if (reportColumn.getC_BPartner_ID() > 0)
-				whcomb.append(" AND C_BPartner_ID=").append(reportColumn.getC_BPartner_ID());
-		
-		if (reportColumn.isIncludeNullsProduct())
-			if (reportColumn.getM_Product_ID() > 0)
-				whcomb.append(" AND (M_Product_ID IS NULL OR M_Product_ID=").append(reportColumn.getM_Product_ID()).append(")");
-			else
-				whcomb.append(" AND M_Product_ID IS NULL");
-		else
-			if (reportColumn.getM_Product_ID() > 0)
-				whcomb.append(" AND M_Product_ID=").append(reportColumn.getM_Product_ID());
-		
-		if (reportColumn.isIncludeNullsProject())
-			if (reportColumn.getC_Project_ID() > 0)
-				whcomb.append(" AND (C_Project_ID IS NULL OR C_Project_ID=").append(reportColumn.getC_Project_ID()).append(")");
-			else
-				whcomb.append(" AND C_Project_ID IS NULL");
-		else
-			if (reportColumn.getC_Project_ID() > 0)
-				whcomb.append(" AND C_Project_ID=").append(reportColumn.getC_Project_ID());
-		
-		if (reportColumn.isIncludeNullsActivity())
-			if (reportColumn.getC_Activity_ID() > 0)
-				whcomb.append(" AND (C_Activity_ID IS NULL OR C_Activity_ID=").append(reportColumn.getC_Activity_ID()).append(")");
-			else
-				whcomb.append(" AND C_Activity_ID IS NULL");
-		else
-			if (reportColumn.getC_Activity_ID() > 0)
-				whcomb.append(" AND C_Activity_ID=").append(reportColumn.getC_Activity_ID());
-		
-		if (reportColumn.isIncludeNullsCampaign())
-			if (reportColumn.getC_Campaign_ID() > 0)
-				whcomb.append(" AND (C_Campaign_ID IS NULL OR C_Campaign_ID=").append(reportColumn.getC_Campaign_ID()).append(")");
-			else
-				whcomb.append(" AND C_Campaign_ID IS NULL");
-		else
-			if (reportColumn.getC_Campaign_ID() > 0)
-				whcomb.append(" AND C_Campaign_ID=").append(reportColumn.getC_Campaign_ID());
-		
-		// Just one Location - selected From - LocTo not supported in combination
-		if (reportColumn.isIncludeNullsLocation())
-			if (reportColumn.getC_Location_ID() > 0)
-				whcomb.append(" AND (C_LocFrom_ID IS NULL OR C_LocFrom_ID=").append(reportColumn.getC_Location_ID()).append(")");
-			else
-				whcomb.append(" AND C_LocFrom_ID IS NULL");
-		else
-			if (reportColumn.getC_Location_ID() > 0)
-				whcomb.append(" AND C_LocFrom_ID=").append(reportColumn.getC_Location_ID());
-		
-		if (reportColumn.isIncludeNullsSalesRegion())
-			if (reportColumn.getC_SalesRegion_ID() > 0)
-				whcomb.append(" AND (C_SalesRegion_ID IS NULL OR C_SalesRegion_ID=").append(reportColumn.getC_SalesRegion_ID()).append(")");
-			else
-				whcomb.append(" AND C_SalesRegion_ID IS NULL");
-		else
-			if (reportColumn.getC_SalesRegion_ID() > 0)
-				whcomb.append(" AND C_SalesRegion_ID=").append(reportColumn.getC_SalesRegion_ID());
-		
-		// Just account - neither UserList1/2 supported in combination
-		if (reportColumn.isIncludeNullsElementValue())
-			if (reportColumn.getC_ElementValue_ID() > 0)
-				whcomb.append(" AND (Account_ID IS NULL OR Account_ID=").append(reportColumn.getC_ElementValue_ID()).append(")");
-			else
-				whcomb.append(" AND Account_ID IS NULL");
-		else
-			if (reportColumn.getC_ElementValue_ID() > 0)
-				whcomb.append(" AND Account_ID=").append(reportColumn.getC_ElementValue_ID());
-		
-		if (reportColumn.isIncludeNullsUserElement1())
-			if (reportColumn.getUserElement1_ID() > 0)
-				whcomb.append(" AND (UserElement1_ID IS NULL OR UserElement1_ID=").append(reportColumn.getUserElement1_ID()).append(")");
-			else
-				whcomb.append(" AND UserElement1_ID IS NULL");
-		else
-			if (reportColumn.getUserElement1_ID() > 0)
-				whcomb.append(" AND UserElement1_ID=").append(reportColumn.getUserElement1_ID());
-		
-		if (reportColumn.isIncludeNullsUserElement2())
-			if (reportColumn.getUserElement2_ID() > 0)
-				whcomb.append(" AND (UserElement2_ID IS NULL OR UserElement2_ID=").append(reportColumn.getUserElement2_ID()).append(")");
-			else
-				whcomb.append(" AND UserElement2_ID IS NULL");
-		else
-			if (reportColumn.getUserElement2_ID() > 0)
-				whcomb.append(" AND UserElement2_ID=").append(reportColumn.getUserElement2_ID());
-		return whcomb.toString();
-	}
-	
+
 	/**************************************************************************
 	 *	Line + Column calculation
 	 */
@@ -926,14 +781,21 @@ public class FinReport extends SvrProcess
 				insertLineSource (line);
 		}
 
+		//	Clean up empty rows
+		StringBuffer sql = new StringBuffer ("DELETE FROM T_Report WHERE ABS(LevelNo)<>0")
+			.append(" AND Col_0 IS NULL AND Col_1 IS NULL AND Col_2 IS NULL AND Col_3 IS NULL AND Col_4 IS NULL AND Col_5 IS NULL AND Col_6 IS NULL AND Col_7 IS NULL AND Col_8 IS NULL AND Col_9 IS NULL")
+			.append(" AND Col_10 IS NULL AND Col_11 IS NULL AND Col_12 IS NULL AND Col_13 IS NULL AND Col_14 IS NULL AND Col_15 IS NULL AND Col_16 IS NULL AND Col_17 IS NULL AND Col_18 IS NULL AND Col_19 IS NULL AND Col_20 IS NULL"); 
+		int no = DB.executeUpdate(sql.toString(), get_TrxName());
+		log.fine("Deleted empty #=" + no);
+		
 		//	Set SeqNo
-		StringBuffer sql = new StringBuffer ("UPDATE T_Report r1 "
+		sql = new StringBuffer ("UPDATE T_Report r1 "
 			+ "SET SeqNo = (SELECT SeqNo "
 				+ "FROM T_Report r2 "
 				+ "WHERE r1.AD_PInstance_ID=r2.AD_PInstance_ID AND r1.PA_ReportLine_ID=r2.PA_ReportLine_ID"
 				+ " AND r2.Record_ID=0 AND r2.Fact_Acct_ID=0)"
 			+ "WHERE SeqNo IS NULL");
-		int no = DB.executeUpdate(sql.toString(), get_TrxName());
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
 		log.fine("SeqNo #=" + no);
 
 		if (!m_report.isListTrx())
@@ -1053,54 +915,29 @@ public class FinReport extends SvrProcess
 				select.append(" AND ").append(s);
 			//	Limited Segment Values
 			if (m_columns[col].isColumnTypeSegmentValue())
-			{
-				String elementType = m_columns[col].getElementType();
-				if (MReportColumn.ELEMENTTYPE_Organization.equals(elementType))
-					select.append(" AND AD_Org_ID=").append(m_columns[col].getOrg_ID());
-				else if (MReportColumn.ELEMENTTYPE_BPartner.equals(elementType))
-					select.append(" AND C_BPartner_ID=").append(m_columns[col].getC_BPartner_ID());
-				else if (MReportColumn.ELEMENTTYPE_Product.equals(elementType))
-					select.append(" AND M_Product_ID=").append(m_columns[col].getM_Product_ID());
-				else if (MReportColumn.ELEMENTTYPE_Project.equals(elementType))
-					select.append(" AND C_Project_ID=").append(m_columns[col].getC_Project_ID());
-				else if (MReportColumn.ELEMENTTYPE_Activity.equals(elementType))
-					select.append(" AND C_Activity_ID=").append(m_columns[col].getC_Activity_ID());
-				else if (MReportColumn.ELEMENTTYPE_Campaign.equals(elementType))
-					select.append(" AND C_Campaign_ID=").append(m_columns[col].getC_Campaign_ID());
-				else if (MReportColumn.ELEMENTTYPE_LocationFrom.equals(elementType))
-					select.append(" AND C_LocFrom_ID=").append(m_columns[col].getC_Location_ID());
-				else if (MReportColumn.ELEMENTTYPE_LocationTo.equals(elementType))
-					select.append(" AND C_LocTo_ID=").append(m_columns[col].getC_Location_ID());
-				else if (MReportColumn.ELEMENTTYPE_OrgTrx.equals(elementType))
-					select.append(" AND AD_OrgTrx_ID=").append(m_columns[col].getOrg_ID());
-				else if (MReportColumn.ELEMENTTYPE_SalesRegion.equals(elementType))
-					select.append(" AND C_SalesRegion_ID=").append(m_columns[col].getC_SalesRegion_ID());
-				else if (MReportColumn.ELEMENTTYPE_Account.equals(elementType))
-					select.append(" AND Account_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserList1.equals(elementType))
-					select.append(" AND User1_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserList2.equals(elementType))
-					select.append(" AND User2_ID=").append(m_columns[col].getC_ElementValue_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserElement1.equals(elementType))
-					select.append(" AND UserElement1_ID=").append(m_columns[col].getUserElement1_ID());
-				else if (MReportColumn.ELEMENTTYPE_UserElement2.equals(elementType))
-					select.append(" AND UserElement2_ID=").append(m_columns[col].getUserElement2_ID());
-				// Financial Report Source with Type Combination
-				else if (MReportColumn.ELEMENTTYPE_Combination.equals(elementType))
-					select.append(getWhereCombination(m_columns[col]));
-			}
+				select.append(m_columns[col].getWhereClause(p_PA_Hierarchy_ID));
+			
 			//	Parameter Where
 			select.append(m_parameterWhere);
 		//	System.out.println("    c=" + col + ", l=" + line + ": " + select);
 			//
 			insert.append("(").append(select).append(")");
 		}
-		//
-		insert.append(" FROM Fact_Acct x WHERE ")
-			.append(m_lines[line].getWhereClause(p_PA_Hierarchy_ID));	//	(sources, posting type)
+		//	WHERE (sources, posting type)
+		StringBuffer where = new StringBuffer(m_lines[line].getWhereClause(p_PA_Hierarchy_ID));
 		String s = m_report.getWhereClause();
 		if (s != null && s.length() > 0)
-			insert.append(" AND ").append(s);
+		{
+			if (where.length() > 0)
+				where.append(" AND ");
+			where.append(s);
+		}
+		if (where.length() > 0)
+			where.append(" AND ");
+		where.append(variable).append(" IS NOT NULL");
+
+		//	FROM .. WHERE
+		insert.append(" FROM Fact_Acct x WHERE ").append(where);	
 		//
 		insert.append(m_parameterWhere)
 			.append(" GROUP BY ").append(variable);
diff --git a/base/src/org/compiere/report/MReportColumn.java b/base/src/org/compiere/report/MReportColumn.java
index 28b4c5098e..7aa3e65f06 100644
--- a/base/src/org/compiere/report/MReportColumn.java
+++ b/base/src/org/compiere/report/MReportColumn.java
@@ -135,6 +135,187 @@ public class MReportColumn extends X_PA_ReportColumn
 	}	//	isTotalBalance
 
 
+	/**
+	 * 	Get Segment Value Where Clause
+	 * 	@param PA_Hierarchy_ID hierarchy
+	 * 	@return where clause
+	 */
+	public String getWhereClause(int PA_Hierarchy_ID)
+	{
+		if (!isColumnTypeSegmentValue())
+			return "";
+		
+		String et = getElementType();
+		//	ID for Tree Leaf Value
+		int ID = 0;
+		//
+		if (MReportSource.ELEMENTTYPE_Account.equals(et))
+			ID = getC_ElementValue_ID();
+		else if (MReportSource.ELEMENTTYPE_Activity.equals(et))
+			ID = getC_Activity_ID();
+		else if (MReportSource.ELEMENTTYPE_BPartner.equals(et))
+			ID = getC_BPartner_ID();
+		else if (MReportSource.ELEMENTTYPE_Campaign.equals(et))
+			ID = getC_Campaign_ID();
+		else if (MReportSource.ELEMENTTYPE_LocationFrom.equals(et))
+			ID = getC_Location_ID();
+		else if (MReportSource.ELEMENTTYPE_LocationTo.equals(et))
+			ID = getC_Location_ID();
+		else if (MReportSource.ELEMENTTYPE_Organization.equals(et))
+			ID = getOrg_ID();
+		else if (MReportSource.ELEMENTTYPE_Product.equals(et))
+			ID = getM_Product_ID();
+		else if (MReportSource.ELEMENTTYPE_Project.equals(et))
+			ID = getC_Project_ID();
+		else if (MReportSource.ELEMENTTYPE_SalesRegion.equals(et))
+			ID = getC_SalesRegion_ID();
+		else if (MReportSource.ELEMENTTYPE_OrgTrx.equals(et))
+			ID = getOrg_ID();	//	(re)uses Org_ID
+		else if (MReportSource.ELEMENTTYPE_UserList1.equals(et))
+			ID = getC_ElementValue_ID();
+		else if (MReportSource.ELEMENTTYPE_UserList2.equals(et))
+			ID = getC_ElementValue_ID();
+		else if (MReportSource.ELEMENTTYPE_UserElement1.equals(et))
+			return "UserElement1_ID="+getUserElement1_ID(); // Not Tree
+		else if (MReportSource.ELEMENTTYPE_UserElement2.equals(et))
+			return "UserElement2_ID="+getUserElement2_ID(); // Not Tree
+		// Financial Report Source with Type Combination
+		else if (MReportSource.ELEMENTTYPE_Combination.equals(et))
+			return getWhereCombination(PA_Hierarchy_ID);
+		else
+			log.warning("Unsupported Element Type=" + et);
+
+		if (ID == 0)
+		{
+			log.fine("No Restrictions - No ID for EntityType=" + et);
+			return "";
+		}
+		
+		
+		return " AND " + MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, et, ID);
+	}	//	getWhereClause
+	
+	/**
+	 * Obtain where clause for the combination type
+	 * @param PA_Hierarchy_ID
+	 * @return
+	 */
+	private String getWhereCombination(int PA_Hierarchy_ID) {
+		StringBuffer whcomb = new StringBuffer();
+		if (getC_ElementValue_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Account, getC_ElementValue_ID());
+			if (isIncludeNullsElementValue())
+				whcomb.append(" AND (Account_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsElementValue())
+				whcomb.append(" AND Account_ID IS NULL");
+
+		if (getC_Activity_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Activity, getC_Activity_ID());
+			if (isIncludeNullsActivity())
+				whcomb.append(" AND (C_Activity_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsActivity())
+				whcomb.append(" AND C_Activity_ID IS NULL");
+
+		if (getC_BPartner_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_BPartner, getC_BPartner_ID());
+			if (isIncludeNullsBPartner())
+				whcomb.append(" AND (C_BPartner_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsBPartner())
+				whcomb.append(" AND C_BPartner_ID IS NULL");
+
+		if (getC_Campaign_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Campaign, getC_Campaign_ID());
+			if (isIncludeNullsCampaign())
+				whcomb.append(" AND (C_Campaign_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsCampaign())
+				whcomb.append(" AND C_Campaign_ID IS NULL");
+
+		if (getC_Location_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_LocationFrom, getC_Location_ID());
+			if (isIncludeNullsLocation())
+				whcomb.append(" AND (C_LocFrom_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsLocation())
+				whcomb.append(" AND C_LocFrom_ID IS NULL");
+
+		if (getOrg_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Organization, getOrg_ID());
+			if (isIncludeNullsOrg())
+				whcomb.append(" AND (AD_Org_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsOrg())
+				whcomb.append(" AND AD_Org_ID IS NULL");
+
+		if (getM_Product_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Product, getM_Product_ID());
+			if (isIncludeNullsProduct())
+				whcomb.append(" AND (M_Product_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsProduct())
+				whcomb.append(" AND M_Product_ID IS NULL");
+
+		if (getC_Project_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_Project, getC_Project_ID());
+			if (isIncludeNullsProject())
+				whcomb.append(" AND (C_Project_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsProject())
+				whcomb.append(" AND C_Project_ID IS NULL");
+
+		if (getC_SalesRegion_ID() > 0) {
+			String whtree = MReportTree.getWhereClause (getCtx(), PA_Hierarchy_ID, MReportSource.ELEMENTTYPE_SalesRegion, getC_SalesRegion_ID());
+			if (isIncludeNullsSalesRegion())
+				whcomb.append(" AND (C_SalesRegion_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsSalesRegion())
+				whcomb.append(" AND C_SalesRegion_ID IS NULL");
+
+		if (getUserElement1_ID() > 0) {
+			String whtree = "UserElement1_ID=" + getUserElement1_ID(); // No Tree
+			if (isIncludeNullsUserElement1())
+				whcomb.append(" AND (UserElement1_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsUserElement1())
+				whcomb.append(" AND UserElement1_ID IS NULL");
+
+		if (getUserElement2_ID() > 0) {
+			String whtree = "UserElement2_ID=" + getUserElement2_ID(); // No Tree
+			if (isIncludeNullsUserElement2())
+				whcomb.append(" AND (UserElement2_ID IS NULL OR ").append(whtree).append(")");
+			else
+				whcomb.append(" AND ").append(whtree);
+		} else
+			if (isIncludeNullsUserElement2())
+				whcomb.append(" AND UserElement2_ID IS NULL");
+
+		return whcomb.toString();
+	}
+
+	
 	/**
 	 * 	Get String Representation
 	 * 	@return	String Representation
@@ -210,7 +391,7 @@ public class MReportColumn extends X_PA_ReportColumn
 	}
 	/**
 	 * 	Column Type Relative Period
-	 *	@return true if ralative period
+	 *	@return true if relative period
 	 */
 	public boolean isColumnTypeRelativePeriod()
 	{
@@ -236,7 +417,66 @@ public class MReportColumn extends X_PA_ReportColumn
 		return bd.intValue();
 	}	//	getRelativePeriodAsInt
 
-
+	/**
+	 *	Get Relative Period
+	 *	@return relative period
+	 */
+	@Override
+	public BigDecimal getRelativePeriod()
+	{
+		if (getColumnType().equals(COLUMNTYPE_RelativePeriod)
+			|| getColumnType().equals(COLUMNTYPE_SegmentValue))
+			return super.getRelativePeriod();
+		return null;
+	}	//	getRelativePeriod
+	/**
+	 *	Get Element Type
+	 */
+	@Override
+	public String getElementType()
+	{
+		if (getColumnType().equals(COLUMNTYPE_SegmentValue))
+			return super.getElementType();
+		return null;
+	}	//	getElementType
+	
+	/**
+	 *	Get Calculation Type
+	 */
+	@Override
+	public String getCalculationType()
+	{
+		if (getColumnType().equals(COLUMNTYPE_Calculation))
+			return super.getCalculationType();
+		return null;
+	}	//	getCalculationType
+	
+	/**
+	 *	Before Save
+	 *	@param newRecord new
+	 *	@return true
+	 */
+	@Override
+	protected boolean beforeSave(boolean newRecord)
+	{
+		//	Validate Type
+		String ct = getColumnType();
+		if (ct.equals(COLUMNTYPE_RelativePeriod))
+		{
+			setElementType(null);
+			setCalculationType(null);
+		}
+		else if (ct.equals(COLUMNTYPE_Calculation))
+		{
+			setElementType(null);
+			setRelativePeriod(null);
+		}
+		else if (ct.equals(COLUMNTYPE_SegmentValue))
+		{
+			setCalculationType(null);
+		}
+		return true;
+	}	//	beforeSave
 	/**************************************************************************
 
 	/**