Completed support for query options sent to rest store