Merged file change from personal working branch.
* Filter functions now return XML instead of JSON.