Index: feed-hst/src/main/java/org/onehippo/forge/feed/api/transform/CalendarToDateConverter.java
===================================================================
--- feed-hst/src/main/java/org/onehippo/forge/feed/api/transform/CalendarToDateConverter.java	(revision 145)
+++ feed-hst/src/main/java/org/onehippo/forge/feed/api/transform/CalendarToDateConverter.java	(working copy)
@@ -31,6 +31,9 @@
 
     @Override
     public Date convert(final Calendar k) {
-        return k.getTime();
+        if (k != null) {
+            return k.getTime();
+        }
+        return null;
     }
 }
Index: feed-hst/src/main/java/org/onehippo/forge/feed/resource/AbstractSyndicationResource.java
===================================================================
--- feed-hst/src/main/java/org/onehippo/forge/feed/resource/AbstractSyndicationResource.java	(revision 145)
+++ feed-hst/src/main/java/org/onehippo/forge/feed/resource/AbstractSyndicationResource.java	(working copy)
@@ -27,12 +27,10 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
 
-import org.hippoecm.hst.content.beans.manager.ObjectConverter;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.hippoecm.hst.content.beans.query.HstQuery;
 import org.hippoecm.hst.content.beans.query.HstQueryResult;
-import org.hippoecm.hst.content.beans.query.filter.BaseFilter;
-import org.hippoecm.hst.content.beans.query.filter.Filter;
-import org.hippoecm.hst.content.beans.query.filter.PrimaryNodeTypeFilterImpl;
 import org.hippoecm.hst.content.beans.standard.HippoBean;
 import org.hippoecm.hst.content.beans.standard.HippoBeanIterator;
 import org.hippoecm.hst.content.beans.standard.HippoDocumentBean;
@@ -92,20 +90,10 @@
 
             // FIXME get date field from BE template?
             HstQuery hstQuery = null;
-            String documentType = document.getDocumentType();
-            if (documentType != null && documentType.trim().length() != 0) {
-                ObjectConverter converter = getObjectConverter(requestContext);
-                // NOTE: for this to work, document needs to be registered within annotated-nbeans XML file
-                final Class<? extends HippoBean> clazz = converter.getAnnotatedClassFor(documentType);
-                if (clazz != null) {
-                    hstQuery = getHstQueryManager(requestContext.getSession(), requestContext).createQuery(scopeBean, clazz, true);
-                } else {
-                    hstQuery = getHstQueryManager(requestContext.getSession(), requestContext).createQuery(scopeBean);
-                    Filter filter = hstQuery.createFilter();
-                    hstQuery.setFilter(filter);
-                    BaseFilter nt = new PrimaryNodeTypeFilterImpl(documentType);
-                    filter.addAndFilter(nt);
-                }
+            String [] documentTypes = StringUtils.split(document.getDocumentType(), ", \t\r\n");
+            if (!ArrayUtils.isEmpty(documentTypes)) {
+                hstQuery = getHstQueryManager(requestContext.getSession(), requestContext)
+                        .createQuery(scopeBean.getNode(), true, documentTypes);
             }
             if (hstQuery == null) {
                 // dunno if we should go further at this point?