Fixed a problem with query/command object reference in _setup, and added the ability to define a function for query/command data
Added the ability to define a function as a data parameter for a query that can reference and resolve properies on the root object