diff --git a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceDatabaseItem.java b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceDatabaseItem.java
index 0a75e73639..23385a064f 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceDatabaseItem.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceDatabaseItem.java
@@ -11,25 +11,19 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
-import org.dspace.xoai.util.MetadataNamePredicate;
 import org.dspace.xoai.util.XOAICacheManager;
 import org.dspace.xoai.util.XOAIDatabaseManager;
 
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
 import com.lyncode.xoai.dataprovider.core.ItemMetadata;
 import com.lyncode.xoai.dataprovider.core.ReferenceSet;
 import com.lyncode.xoai.dataprovider.data.AbstractAbout;
 import com.lyncode.xoai.dataprovider.exceptions.MetadataBindException;
-import com.lyncode.xoai.dataprovider.xml.xoai.Element;
-import com.lyncode.xoai.dataprovider.xml.xoai.Element.Field;
 
 /**
  * 
@@ -103,15 +97,6 @@ public class DSpaceDatabaseItem extends DSpaceItem
         return item.isWithdrawn();
     }
 
-    private static Element getElement(List<Element> list, String name)
-    {
-        for (Element e : list)
-            if (name.equals(e.getName()))
-                return e;
-
-        return null;
-    }
-
     private ItemMetadata metadata = null;
     
     @Override
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSet.java b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSet.java
index a0ef900902..30adacefbb 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSet.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSet.java
@@ -20,10 +20,9 @@ public class DSpaceSet extends Set {
 	private static final String DefaultName = "undefined";
 
 	public static String checkName(String name) {
-		if (name == null || name.trim().equals(""))
-			return DefaultName;
-		else
+		if (name != null && !name.trim().equals(""))
 			return name;
+		return DefaultName;
 	}
 
 	public static Set newDSpaceCommunitySet(String handle, String name) {
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java
index eb912eb97a..f28517ddff 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceSolrItem.java
@@ -35,6 +35,7 @@ public class DSpaceSolrItem extends DSpaceItem
     private boolean deleted;
     
     public DSpaceSolrItem (SolrDocument doc) {
+    	log.debug("Creating OAI Item from Solr source");
         unparsedMD = (String) doc.getFieldValue("item.compile");
         handle = (String) doc.getFieldValue("item.handle");
         lastMod = (Date) doc.getFieldValue("item.lastmodified");
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceFilter.java
index 0847dbb35b..12531164bc 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceFilter.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceFilter.java
@@ -10,7 +10,6 @@ package org.dspace.xoai.filter;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.dspace.core.Context;
-import org.dspace.xoai.data.DSpaceDatabaseItem;
 import org.dspace.xoai.data.DSpaceItem;
 
 import com.lyncode.xoai.dataprovider.data.AbstractItemIdentifier;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceMetadataExistsFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceMetadataExistsFilter.java
index bf2491702d..cc588286d4 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceMetadataExistsFilter.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/DSpaceMetadataExistsFilter.java
@@ -12,7 +12,6 @@ import java.sql.SQLException;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.dspace.core.Context;
-import org.dspace.xoai.data.DSpaceDatabaseItem;
 import org.dspace.xoai.data.DSpaceItem;
 import org.dspace.xoai.exceptions.InvalidMetadataFieldException;
 import org.dspace.xoai.util.MetadataFieldManager;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/DateFromFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/DateFromFilter.java
index 118c76172b..916c3afcf3 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/filter/DateFromFilter.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/DateFromFilter.java
@@ -11,7 +11,6 @@ import java.util.Date;
 
 import org.apache.solr.client.solrj.util.ClientUtils;
 import org.dspace.core.Context;
-import org.dspace.xoai.data.DSpaceDatabaseItem;
 import org.dspace.xoai.data.DSpaceItem;
 import org.dspace.xoai.util.DateUtils;
 
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java
index 7c1f8a2f9b..f0a06abc7b 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java
@@ -9,10 +9,9 @@ package org.dspace.xoai.filter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.apache.solr.client.solrj.util.ClientUtils;
 
+import org.apache.solr.client.solrj.util.ClientUtils;
 import org.dspace.core.Context;
-import org.dspace.xoai.data.DSpaceDatabaseItem;
 import org.dspace.xoai.data.DSpaceItem;
 
 /**
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/DspaceSetSpecFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/DspaceSetSpecFilter.java
index 5e03165575..67e9e48e84 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/filter/DspaceSetSpecFilter.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/DspaceSetSpecFilter.java
@@ -12,16 +12,10 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.dspace.core.Context;
-
-import java.sql.SQLException;
 import org.apache.solr.client.solrj.util.ClientUtils;
-import org.dspace.content.Collection;
-import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
-import org.dspace.content.Item;
+import org.dspace.core.Context;
 import org.dspace.handle.HandleManager;
-import org.dspace.xoai.data.DSpaceDatabaseItem;
 import org.dspace.xoai.data.DSpaceItem;
 import org.dspace.xoai.util.XOAIDatabaseManager;
 
diff --git a/dspace/config/crosswalks/oai/metadataFormats/didl.xsl b/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
index 763957d172..d61ca1f36e 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/didl.xsl
@@ -31,7 +31,7 @@
 			</xsl:if>
 			<d:Item>
 				<xsl:attribute name="id">
-					<xsl:value-of select="translate(doc:metadata/doc:element[@name='others']/doc:field[@name='handle']/text(),'/','_')" />
+					<xsl:value-of select="concat('hdl_', translate(doc:metadata/doc:element[@name='others']/doc:field[@name='handle']/text(),'/','_'))" />
 				</xsl:attribute>
 				<d:Descriptor>
 					<d:Statement mimeType="application/xml; charset=utf-8">
diff --git a/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl b/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
index 40ea796f96..c06eac5577 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/oai_dc.xsl
@@ -20,7 +20,7 @@
 	
 	<xsl:template match="/">
 		<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
-			xmlns:dc="http://purl.org/dc/doc:elements/1.1/" 
+			xmlns:dc="http://purl.org/dc/elements/1.1/" 
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 			xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
 			<xsl:for-each select="doc:metadata/doc:element[@name='dc']/doc:element[@name='title']/doc:element/doc:field[@name='value']">
diff --git a/dspace/config/crosswalks/oai/metadataFormats/ore.xsl b/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
index 8b206b4558..0a59e737c5 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/ore.xsl
@@ -19,7 +19,7 @@
 	<xsl:template match="/">
 		<atom:entry xmlns:atom="http://www.w3.org/2005/Atom"
 			xmlns:ore="http://www.openarchives.org/ore/terms/" xmlns:oreatom="http://www.openarchives.org/ore/atom/"
-			xmlns:dcterms="http://purl.org/dc/terms/">
+			xmlns:dcterms="http://purl.org/dc/terms/" xsi:schemaLocation="http://www.w3.org/2005/Atom http://www.kbcafe.com/rss/atom.xsd.xml">
 			<atom:id>
 				<xsl:value-of select="concat(doc:metadata/doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']/doc:element/doc:field[@name='value']/text(), '/ore.xml')"></xsl:value-of>
 			</atom:id>