diff --git a/src/db-sql.c b/src/db-sql.c
index 4a1b8842..da240bb3 100644
--- a/src/db-sql.c
+++ b/src/db-sql.c
@@ -68,7 +68,7 @@ int db_sql_parse_smart(char **pe, char **clause, char *phrase);
 #define MAYBEFREE(a) { if((a)) free((a)); };
 #define DMAPLEN(a) (((a) && strlen(a)) ? (8+(int)strlen((a))) : \
                                          ((pinfo->zero_length) ? 8 : 0))
-#define EMIT(a) (pinfo->zero_length ? 1 : ((a) && strlen((a))))
+#define EMIT(a) (pinfo->zero_length ? 1 : ((a) && strlen((a))) ? 1 : 0)
 
 /**
  * functions for the specific db backend
@@ -1424,7 +1424,8 @@ int db_sql_get_size(DBQUERYINFO *pinfo, SQL_ROW valarray) {
         if(db_wantsmeta(pinfo->meta, metaContainerItemId))
             /* mcti */
             size += 12;
-        if(ISSTR(valarray[37]) && db_wantsmeta(pinfo->meta, metaSongCodecType))
+	if((valarray[37]) && (strlen(valarray[37]) == 4) && 
+	   db_wantsmeta(pinfo->meta,metaSongCodecType)) 
             /* ascd */
             size += 12;
 
@@ -1564,7 +1565,8 @@ int db_sql_build_dmap(DBQUERYINFO *pinfo, char **valarray, unsigned char *presul
             current += db_dmap_add_char(current,"asur",(char)atoi(valarray[25]));
         if(valarray[18] && atoi(valarray[18]) && db_wantsmeta(pinfo->meta, metaSongYear))
             current += db_dmap_add_short(current,"asyr",(short)atoi(valarray[18]));
-        if(EMIT(valarray[37]) && db_wantsmeta(pinfo->meta, metaSongCodecType))
+	if((valarray[37]) && (strlen(valarray[37]) == 4) && 
+	   db_wantsmeta(pinfo->meta,metaSongCodecType))
             current += db_dmap_add_literal(current,"ascd",valarray[37],4);
         if(db_wantsmeta(pinfo->meta, metaContainerItemId))
             current += db_dmap_add_int(current,"mcti",atoi(valarray[0]));