Updated parameters. Also, updated the query passed to ClosestFacility to limit Fields being passed around when they're not needed.