Adding error to query() command
Adding extra callback types to Match. URI still doesn't work with params