Added support for cors querying