Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
===================================================================
diff -u -r24077 -r24082
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 24077)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 24082)
@@ -5,8 +5,6 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -18,6 +16,8 @@
 import org.hibernate.Session;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import com.forgon.Constants;
 import com.forgon.directory.acegi.tools.AcegiHelper;
@@ -385,7 +385,7 @@
 	}
 	
 	public int getImagesCount(ObjectDao objectDao) {
-		String sql = " where po.materialDefinition_id=" + id;
+		String sql = " where po.materialDefinition_id=" + id + " and imageType='" + ImageFile.IMAGE_TYPE_MATERIAL+"'";
 		
 		int count = objectDao.countObjectBySql(ImageFile.class.getSimpleName(), sql);
 		return count;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r22260 -r24082
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 22260)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 24082)
@@ -214,7 +214,7 @@
 		$.ajax({
 			type : 'get',
 			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialPictureAmount.do',
-			data : 'name=' + encodeURI(materialName),
+			data : 'name=' + encodeURIComponent(materialName),
 			dataType : 'text',
 			success : function(msg) {
 				var amount = parseInt(msg, 10);