     targets = constructorNames
 
     filters = []
-    if options?.filters
+    if options.filters
       for filter in options.filters  when filter in relationshipNames
         filters.push filter
 
     if filters.length > 0
-      sources = filterSources options.filters
-      as      = options.filters
-      targets = filterTargets options.filters
+      sources = mapSourceNames filters
+      as      = filters
+      targets = mapTargetNames filters
 
 
     from = options.from or +(new Date())

        do kallback

  @fetch = secure (client, options = {}, callback) ->
    {connection: {delegate}} = client

    sources = constructorNames

      targetName : "$in": targets
      timestamp : {"$lt" : new Date(from)}

    relOptions      =
      # do not fetch more than 15 at once
      limit      : 10 # Math.min options.limit ? 15, 15
      sort       : timestamp  : -1

    Relationship.some selector, relOptions, (err, relationships) ->
      buckets = []
      return  callback err, buckets  if err
      daisy queue = relationships.map (relationship) ->
