     url
 
   execute: (callback) ->
-    Yardbase.Query.jsonpCallbacks[@id] = callback || @defaultCallback
+    Yardbase.Query.callbacks[@callbackKey] = callback || @defaultCallback
     Yardbase.includeScriptTag @url()
 
 


  url: ->
    url = "#{Yardbase.host}/things.json?" 
    params = ["jsonpCallback=Yardbase.Query.jsonpCallbacks[#{@id}]"]
    if @tag_list.length > 0
      params.push "tags=" + encodeURIComponent(@tag_list.join(','))


class Yardbase.Query
  queryParams: {}
  tag_list: []
  @callbacks: {}
  defaultCallback: (result) -> 
    console?.log 'Please include a callback in to Yardbase.Query.execute()'
    console?.log result

  constructor: ->
    @callbackKey = new Date().getTime()
    @

  with_tag: (tag) ->
    @tag_list.push(tag)
