diff --git a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
index 062c879..38ad87d 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
@@ -21,8 +21,8 @@ public class CutPieceDAO {
 	private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String SELECT_BY_ITEM_IDS = String.format( "SELECT * FROM %s WHERE job_card_item_id IN (:item_ids)", TABLE_NAME );
-	private final String SELECT_BY_ITEM_IDS_AND_GROUP_BY = String.format( "SELECT  id,job_card_item_id,'type',SUM(quantity) AS quantity FROM %s WHERE job_card_item_id IN (:item_ids) GROUP BY job_card_item_id, 'type'", TABLE_NAME );
-	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, job_card_item_id, 'type', quantity) VALUES (:id, :job_card_item_id, :type, :quantity) ON DUPLICATE KEY UPDATE job_card_item_id = VALUES(job_card_item_id), 'type' = VALUES('type'), quantity = VALUES(quantity)", TABLE_NAME );
+	private final String SELECT_BY_ITEM_IDS_AND_GROUP_BY = String.format( "SELECT  id,job_card_item_id,`type`,SUM(quantity) AS quantity FROM %s WHERE job_card_item_id IN (:item_ids) GROUP BY job_card_item_id, `type`", TABLE_NAME );
+	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, job_card_item_id, `type`, quantity) VALUES (:id, :job_card_item_id, :type, :quantity) ON DUPLICATE KEY UPDATE job_card_item_id = VALUES(job_card_item_id), `type` = VALUES(`type`), quantity = VALUES(quantity)", TABLE_NAME );
 	private final String DELETE_BY_ITEM_ID = String.format( "DELETE FROM %s WHERE job_card_item_id = :job_card_item_id", TABLE_NAME );
 
 	public CutPieceDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {