Index: cm1/class.tx_templavoila_cm1_dsedit.php
===================================================================
--- cm1/class.tx_templavoila_cm1_dsedit.php	(revision 30838)
+++ cm1/class.tx_templavoila_cm1_dsedit.php	(working copy)
@@ -154,7 +154,7 @@
 						}
 						$form .= '
 						</optgroup>
-					</select><input type="hidden"
+					</select><p>' . $GLOBALS['LANG']->getLL('mapWarningElementChange') . '</p><input type="hidden"
 						name="'.$formFieldName.'[tx_templavoila][eType_before]"
 						value="'.$insertDataArray['tx_templavoila']['eType'].'" /></dd>';
 					}
Index: cm1/class.tx_templavoila_cm1_etypes.php
===================================================================
--- cm1/class.tx_templavoila_cm1_etypes.php	(revision 30838)
+++ cm1/class.tx_templavoila_cm1_etypes.php	(working copy)
@@ -146,7 +146,7 @@
 							}
 							/* preserve previous config, if explicitly set */
 							if (!isset($elArray[$key]['TCEforms']['proc']['HSC'])) {
-							$elArray[$key]['tx_templavoila']['proc']['HSC']=0;
+								$elArray[$key]['tx_templavoila']['proc']['HSC'] = 0 ;
 							}
 
 							/* preserve previous config, if of the right kind */
@@ -165,6 +165,7 @@
 							$maxW = $contentInfo['img']['width'] ? $contentInfo['img']['width'] : $eTypes['eType'][$eType]['maxWdefault'];
 							$maxH = $contentInfo['img']['height'] ? $contentInfo['img']['height'] : $eTypes['eType'][$eType]['maxHdefault'];
  							$typoScriptImageObject = ($elArray[$key]['type'] == 'attr') ? 'IMG_RESOURCE' : 'IMAGE';
+							$elArray[$key]['tx_templavoila']['proc']['HSC'] = 0;
 
 							/* preserve previous config, if of the right kind */
 							if ($reset || !trim($elArray[$key]['tx_templavoila']['TypoScript'])) {
@@ -174,7 +175,7 @@
 									'MAXW'  => $maxW,
 									'MAXH'  => $maxH
 								));
-	}
+							}
 
 
 								// Finding link-fields on same level and set the image to be linked by that TypoLink:
@@ -196,14 +197,14 @@
 							/* preserve previous config, if of the right kind */
 							if ($reset || !trim($elArray[$key]['tx_templavoila']['TypoScript'])) {
 								$elArray[$key]['tx_templavoila']['TypoScript'] = $eTypes['eType'][$eType]['Typoscript'];
-							if ($elArray[$key]['type'] == 'attr') {
+								if ($elArray[$key]['type'] == 'attr') {
 									$elArray[$key]['tx_templavoila']['TypoScript'] .= chr(10) . '10.typolink.returnLast = url';
 									/* preserve previous config, if explicitly set */
 									if (!isset($elArray[$key]['TCEforms']['proc']['HSC'])) {
-								$elArray[$key]['tx_templavoila']['proc']['HSC']=1;
+										$elArray[$key]['tx_templavoila']['proc']['HSC'] = 1;
+									}
+								}
 							}
-							}
-							}
 						break;
 						case 'ce':
 							/* preserve previous config, if of the right kind */
@@ -217,9 +218,9 @@
 								$elArray[$key]['tx_templavoila']['TypoScript'] = $eTypes['eType'][$eType]['Typoscript'];
 								if ($scope == 1) {
 									$elArray[$key]['tx_templavoila']['TypoScript'] .= chr(10) . '10.wrap = <!--TYPO3SEARCH_begin--> | <!--TYPO3SEARCH_end-->';
+								}
 							}
-							}
-
+							$elArray[$key]['tx_templavoila']['proc']['HSC'] = 0;
 						break;
 						case 'int':
 							/* preserve previous config, if of the right kind */
@@ -227,6 +228,7 @@
 								$elArray[$key]['TCEforms']['label']=$elArray[$key]['tx_templavoila']['title'];
 								$elArray[$key]['TCEforms']['config'] = $eTypes['eType'][$eType]['TCEforms']['config'];
 							}
+							$elArray[$key]['tx_templavoila']['proc']['int'] = 1;
 						break;
 						case 'select':
 							/* preserve previous config, if of the right kind */
@@ -274,7 +276,7 @@
 								));
 
 							} else {	// Normal output.
-								$elArray[$key]['tx_templavoila']['proc']['HSC']=1;
+								$elArray[$key]['tx_templavoila']['proc']['HSC'] = 1;
 							}
 
 							if ($reset) {
@@ -296,6 +298,7 @@
 									($elArray[$key]['tx_templavoila']['TypoScriptObjPath'] ?
 										$elArray[$key]['tx_templavoila']['TypoScriptObjPath'] : ''));
 							}
+							$elArray[$key]['tx_templavoila']['proc']['HSC'] = 0;
 						break;
 						case 'none':
 							unset($elArray[$key]['TCEforms']['config']);
Index: cm1/locallang.xml
===================================================================
--- cm1/locallang.xml	(revision 30838)
+++ cm1/locallang.xml	(working copy)
@@ -132,6 +132,7 @@
 			<label index="mapPreviewInfo">Preview of Data Structure sample data merged into the mapped tags</label>
 			<label index="mapDSelement">Mapping Data Element</label>
 			<label index="mapLimitToTags">Limiting to tags</label>
+			<label index="mapWarningElementChange">Changing element type will change your existing settings!</label>
 			
 			<label index="displayDSTitleTranslated">This title is translated!</label>
 			<label index="displayDSContentFound">Content found (%s chars)</label>