diff --git a/installer/kohastructure.sql b/installer/kohastructure.sql
index d3c89278eb..12ad698e9e 100644
--- a/installer/kohastructure.sql
+++ b/installer/kohastructure.sql
@@ -912,11 +912,11 @@ CREATE TABLE `itemtypes` (
 DROP TABLE IF EXISTS `labels`;
 CREATE TABLE `labels` (
   `labelid` int(11) NOT NULL auto_increment,
-   `batch_id`   varchar(10)  NOT NULL,
+  `batch_id` varchar(10) NOT NULL default '1',
   `itemnumber` varchar(100) NOT NULL default '',
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`labelid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=12143 DEFAULT CHARSET=utf8;
 
 --
 -- Table structure for table `labels_conf`
@@ -926,21 +926,25 @@ DROP TABLE IF EXISTS `labels_conf`;
 CREATE TABLE `labels_conf` (
   `id` int(4) NOT NULL auto_increment,
   `barcodetype` char(100) default '',
-  `title` tinyint(1) default 0,
-  `isbn` tinyint(1) default 0,
-  `itemtype` tinyint(1) default 0,
-  `barcode` tinyint(1) default 0,
-  `dewey` tinyint(1) default 0,
-  `class` tinyint(1) default 0,
-  `author` tinyint(1) default 0,
-  `papertype` char(100) default '',
-  `startrow` int(2) default NULL,
-  `subclass` tinyint(1) default '0',
-  `itemcallnumber` tinyint(1) default '0',
-  `printingtype` char(10) default NULL,
-  `guidebox` tinyint(1) default NULL,
-  PRIMARY KEY  (`id`)  
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  `title` int(1) default '0',
+  `itemtype` int(1) default '0',
+  `barcode` int(1) default '0',
+  `dewey` int(1) default '0',
+  `class` int(1) default '0',
+  `subclass` int(1) default '0',
+  `itemcallnumber` int(1) default '0',
+  `author` int(1) default '0',
+  `issn` int(1) default '0',
+  `isbn` int(1) default '0',
+  `startlabel` int(2) NOT NULL default '1',
+  `printingtype` char(32) default 'BAR',
+  `layoutname` char(20) NOT NULL default 'TEST',
+  `guidebox` int(1) default '0',
+  `active` tinyint(1) default '1',
+  `fonttype` char(10) default NULL,
+  `subtitle` int(1) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 
 --
 -- Table structure for table `labels_templates`
@@ -949,8 +953,8 @@ CREATE TABLE `labels_conf` (
 DROP TABLE IF EXISTS `labels_templates`;
 CREATE TABLE `labels_templates` (
   `tmpl_id` int(4) NOT NULL auto_increment,
-  `tmpl_code` char(100) default '',
-  `tmpl_desc` char(100) default '',
+  `tmpl_code` char(100) character set utf8 collate utf8_unicode_ci default '',
+  `tmpl_desc` char(100) character set utf8 collate utf8_unicode_ci default '',
   `page_width` float default '0',
   `page_height` float default '0',
   `label_width` float default '0',
@@ -962,11 +966,10 @@ CREATE TABLE `labels_templates` (
   `colgap` float default '0',
   `rowgap` float default '0',
   `active` int(1) default NULL,
-  `units` char(20) default 'PX',
-  `fontsize` int(4) default NULL,
+  `units` char(20) character set utf8 collate utf8_unicode_ci default 'PX',
+  `fontsize` int(4) NOT NULL default '3',
   PRIMARY KEY  (`tmpl_id`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 
 --
 -- Table structure for table `letter`
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index c365a6279c..45d87d4ca8 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -74,7 +74,7 @@ if ( $op eq "do_search" ) {
       #  $startfrom * $resultsperpage,
       #  $resultsperpage, $orderby );
 
-use Data::Dumper;
+#use Data::Dumper;
 my $searchquery=$marclist[0];
 my ($error, $marcresults) = SimpleSearch($searchquery);