Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java
===================================================================
diff -u -r41131 -r41168
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java	(.../DeviceMaintenanceHelper.java)	(revision 41131)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java	(.../DeviceMaintenanceHelper.java)	(revision 41168)
@@ -402,6 +402,8 @@
 												}else{
 													vo.setValue(thisValue);
 												}
+											}else{
+												continue;
 											}
 										}
 										if(vo != null){
@@ -433,6 +435,9 @@
 									
 								}
 							}else{
+								if(enableCustomReportDisplayOptions && StringUtils.isBlank(formInstanceItem.getAnswer())){
+									continue;
+								}
 								FormInstanceVo vo = new FormInstanceVo();
 								if(formInstanceVoMap.containsKey(formInstance.getId())){
 									FormInstanceVo templateVo = formInstanceVoMap.get(formInstance.getId());